[X2Go-Commits] [vcxsrv] 16/24: Solved hang-up problem during closing
git-admin at x2go.org
git-admin at x2go.org
Sun May 3 23:21:45 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to annotated tag 1.17.0.0
in repository vcxsrv.
commit 57dd848fb6dd7cf15820172e2abc9fb9de2b4268
Author: marha <marha at users.sourceforge.net>
Date: Fri Apr 3 18:02:11 2015 +0200
Solved hang-up problem during closing
---
libX11/src/GetProp.c | 2 +-
xorg-server/hw/xwin/winclipboard/thread.c | 23 -----------------------
xorg-server/hw/xwin/winclipboard/wndproc.c | 1 +
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/libX11/src/GetProp.c b/libX11/src/GetProp.c
index 9eb422e..88ec282 100644
--- a/libX11/src/GetProp.c
+++ b/libX11/src/GetProp.c
@@ -64,7 +64,7 @@ XGetWindowProperty(
req->delete = delete;
req->longOffset = offset;
req->longLength = length;
- error.sequenceNumber = dpy->request;
+ error.sequenceNumber = (CARD16)(dpy->request&0xffff);
if (!_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
UnlockDisplay(dpy);
diff --git a/xorg-server/hw/xwin/winclipboard/thread.c b/xorg-server/hw/xwin/winclipboard/thread.c
index 20c473d..bb74189 100755
--- a/xorg-server/hw/xwin/winclipboard/thread.c
+++ b/xorg-server/hw/xwin/winclipboard/thread.c
@@ -359,29 +359,6 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay)
"Bailing.\n", iReturn);
break;
}
-
- if (FD_ISSET(iConnectionNumber, &fdsRead)) {
- winDebug
- ("winClipboardProc - X connection ready, pumping X event queue\n");
- }
-
-#ifdef HAS_DEVWINDOWS
- /* Check for Windows event ready */
- if (FD_ISSET(fdMessageQueue, &fdsRead))
-#else
- if (1)
-#endif
- {
- winDebug
- ("winClipboardProc - /dev/windows ready, pumping Windows message queue\n");
- }
-
-#ifdef HAS_DEVWINDOWS
- if (!(FD_ISSET(iConnectionNumber, &fdsRead)) &&
- !(FD_ISSET(fdMessageQueue, &fdsRead))) {
- winDebug("winClipboardProc - Spurious wake, select() returned %d\n", iReturn);
- }
-#endif
}
/* Close our X window */
diff --git a/xorg-server/hw/xwin/winclipboard/wndproc.c b/xorg-server/hw/xwin/winclipboard/wndproc.c
index c999751..2190856 100755
--- a/xorg-server/hw/xwin/winclipboard/wndproc.c
+++ b/xorg-server/hw/xwin/winclipboard/wndproc.c
@@ -170,6 +170,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
s_hwndNextViewer = NULL;
g_hwndClipboard = NULL;
+ PostMessage(hwnd, WM_WM_QUIT, 0L, 0L);
}
return 0;
--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
More information about the x2go-commits
mailing list