aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-07 11:47:39 +0000
committermarha <marha@users.sourceforge.net>2010-07-07 11:47:39 +0000
commitc23b5379fd9f4da7bcd627e973abb6868274fc75 (patch)
tree2d5bdf007be4502f5426beeb80a4378190f275a4
parent3dd9390c49402534bc391f621a6b0f497a9407f7 (diff)
downloadvcxsrv-c23b5379fd9f4da7bcd627e973abb6868274fc75.tar.gz
vcxsrv-c23b5379fd9f4da7bcd627e973abb6868274fc75.tar.bz2
vcxsrv-c23b5379fd9f4da7bcd627e973abb6868274fc75.zip
Solved possible dead-lock exiting
-rw-r--r--xorg-server/hw/xwin/InitOutput.c1
-rw-r--r--xorg-server/hw/xwin/winwndproc.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 14d88894b..6dc58aeb1 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -170,6 +170,7 @@ winClipboardShutdown (void)
/* Synchronously destroy the clipboard window */
if (g_hwndClipboard != NULL)
{
+ g_fClipboardStarted=FALSE; /* This is to avoid dead-locls caused by the clipboard thread still doing some stuff */
SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);
/* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
}
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index ca3a66b49..ab01f44ea 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -50,6 +50,7 @@
* Global variables
*/
+extern Bool g_fClipboardStarted;
Bool g_fCursor = TRUE;
Bool g_fButton[3] = { FALSE, FALSE, FALSE };
@@ -1198,6 +1199,7 @@ winWindowProc (HWND hwnd, UINT message,
if (s_pScreenInfo->fMultiWindow)
winDeinitMultiWindowWM ();
#endif
+ g_fClipboardStarted=FALSE; /* This is to avoid dead-locls caused by the clipboard thread still doing some stuff */
GiveUp (0);
return 0;