aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-23 20:47:15 +0000
committermarha <marha@users.sourceforge.net>2009-09-23 20:47:15 +0000
commit10c7b1d5bacbb84626a19d6de93175c8784b9d1e (patch)
tree05d131265c5f6fb7ff3d713ca9be1361217736bb
parent4e6f458771a9a6533f1c0f75a2896d3286249d7e (diff)
downloadvcxsrv-10c7b1d5bacbb84626a19d6de93175c8784b9d1e.tar.gz
vcxsrv-10c7b1d5bacbb84626a19d6de93175c8784b9d1e.tar.bz2
vcxsrv-10c7b1d5bacbb84626a19d6de93175c8784b9d1e.zip
Solved endless looping when clipboardthread is restarted due to winioerrhandler.
-rw-r--r--xorg-server/hw/xwin/winclipboardthread.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index d564876eb..edade899d 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -133,6 +133,12 @@ winClipboardProc (void *pvNotUsed)
goto thread_errorexit;
}
+ /* Create Windows messaging window */
+ hwnd = winClipboardCreateMessagingWindow ();
+
+ /* Save copy of HWND in screen privates */
+ g_hwndClipboard = hwnd;
+
/* Set jump point for Error exits */
iReturn = setjmp (g_jmpEntry);
@@ -266,12 +272,6 @@ winClipboardProc (void *pvNotUsed)
/* Save the window in the screen privates */
g_iClipboardWindow = iWindow;
- /* Create Windows messaging window */
- hwnd = winClipboardCreateMessagingWindow ();
-
- /* Save copy of HWND in screen privates */
- g_hwndClipboard = hwnd;
-
/* Assert ownership of selections if Win32 clipboard is owned */
if (NULL != GetClipboardOwner ())
{