diff options
| author | Michel Hummel <hummel.michel@gmail.com> | 2010-08-06 15:23:52 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-01-26 14:10:48 +0000 |
| commit | 75fe336b6c903133ae386f5cb8d308a0e9e2768e (patch) | |
| tree | f888c689421b9119b37a2279e0b122a6efeb24a1 | |
| parent | 95b1391fe3d3192abdfbad4140513b2112cfa02a (diff) | |
hw/xwin: Mitigate a race condition in clipboard thread initialization
Remove the variables g_fClipboardLaunched and g_fClipboardStarted from
winInitializeGlobals(), as their re-initialization is handled in the
file hw/xwin/InitOutput.c.
Re-initializing g_fClipboardLaunched and g_fClipboardStarted during
the server reset procedure can lead to the clipboard thread being
launched two times and sometimes leads to a crash of the X server...
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | hw/xwin/winglobals.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c index 631f12e21..655cdb131 100644 --- a/hw/xwin/winglobals.c +++ b/hw/xwin/winglobals.c @@ -114,8 +114,6 @@ winInitializeGlobals (void) { g_dwCurrentThreadID = GetCurrentThreadId (); #ifdef XWIN_CLIPBOARD - g_fClipboardLaunched = FALSE; - g_fClipboardStarted = FALSE; g_iClipboardWindow = None; g_pClipboardDisplay = NULL; g_atomLastOwnedSelection = None; |