Index: /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp	(revision 61653)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp	(revision 61654)
@@ -3210,4 +3210,6 @@
     LogRel2(("DnD: Terminating threads ...\n"));
 
+    ASMAtomicXchgBool(&m_fSrvStopping, true);
+
     /*
      * Wait for threads to terminate.
@@ -3216,5 +3218,9 @@
     if (m_hHGCMThread != NIL_RTTHREAD)
     {
+#if 0 /** @todo Does not work because we don't cancel the HGCM call! */
         rc2 = RTThreadWait(m_hHGCMThread, 30 * 1000 /* 30s timeout */, &rcThread);
+#else
+        rc2 = RTThreadWait(m_hHGCMThread, 200 /* 200ms timeout */, &rcThread);
+#endif
         if (RT_SUCCESS(rc2))
             rc2 = rcThread;