Handle clients lost during querying

diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index 8be9aa3d3a8c7b844f5cd2d7a2e106d9ba92ca0a..eb36467e2d5404b6fbce9cae51b8202d07f1ee6c 100644 (file)
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -288,9 +288,19 @@ void XDesktop::queryConnection(network::Socket* sock,
 {
   assert(isRunning());
 
+  // Someone already querying?
   if (queryConnectSock) {
-    server->approveConnection(sock, false, "Another connection is currently being queried.");
-    return;
+    std::list<network::Socket*> sockets;
+    std::list<network::Socket*>::iterator i;
+
+    // Check if this socket is still valid
+    server->getSockets(&sockets);
+    for (i = sockets.begin(); i != sockets.end(); i++) {
+      if (*i == queryConnectSock) {
+        server->approveConnection(sock, false, "Another connection is currently being queried.");
+        return;
+      }
+    }
   }
 
   if (!userName)