Changeset 795 for trunk/src/network/socket

Timestamp:

Oct 15, 2010, 5:03:29 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

network: Fixed: QLocalServer could hang forever in the destructor trying to close the listen socket being watched by a socket notifier. This fixes the Assistant application hang at startup.

File:

• trunk/src/network/socket/qlocalserver_os2.cpp (modified) (1 diff)

trunk/src/network/socket/qlocalserver_os2.cpp

@@ -134 +134 @@
 void QLocalServerPrivate::closeServer()
 {
-    if (-1 != listenSocket)
+    if (-1 != listenSocket) {
+        // stop select()ing on this socket, otherwise close() will hang
+        socketNotifier->setEnabled(false);
         QT_CLOSE(listenSocket);
-    listenSocket = -1;
+        listenSocket = -1;
+    }
 
     if (socketNotifier) {