summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-24 07:54:04 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-24 09:53:08 (GMT)
commita26aec8673cd5c1e3169b0ad4cd9ee748ba56bb4 (patch)
treec7abae7ff61497f4d6249864fc409db71e15bfc5 /src/network
parent391940bb9e3eef13efad9550d6e35b3db6f83c17 (diff)
downloadQt-a26aec8673cd5c1e3169b0ad4cd9ee748ba56bb4.zip
Qt-a26aec8673cd5c1e3169b0ad4cd9ee748ba56bb4.tar.gz
Qt-a26aec8673cd5c1e3169b0ad4cd9ee748ba56bb4.tar.bz2
don't complain about invalid socket on server shutdown
Reviewed-by: thiago
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qlocalserver_unix.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 065a9de..e7d2252 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -148,9 +148,11 @@ void QLocalServerPrivate::closeServer()
QT_CLOSE(listenSocket);
listenSocket = -1;
- if (socketNotifier)
+ if (socketNotifier) {
+ socketNotifier->setEnabled(false); // Otherwise, closed socket is checked before deleter runs
socketNotifier->deleteLater();
- socketNotifier = 0;
+ socketNotifier = 0;
+ }
if (!fullServerName.isEmpty())
QFile::remove(fullServerName);