2 files changed, 1 insertions, 23 deletions
diff --git a/xorg-server/hw/xwin/winclipboard/thread.c b/xorg-server/hw/xwin/winclipboard/thread.c
index 20c473dd8..bb7418992 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 c99975193..219085682 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;