summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-06-30 11:12:12 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-06-30 11:32:25 (GMT)
commit4be64775a5b3964e611e7fdb334edd33b1ef6b9b (patch)
tree6644958d2ad8ce50d059bb55d5b9ba50e02000fd
parent238a618b5482e0471f46ed71362492be9c4df4a6 (diff)
downloadQt-4be64775a5b3964e611e7fdb334edd33b1ef6b9b.zip
Qt-4be64775a5b3964e611e7fdb334edd33b1ef6b9b.tar.gz
Qt-4be64775a5b3964e611e7fdb334edd33b1ef6b9b.tar.bz2
fix crash in QLocalServer on WinCE when waitForNewConnection times out
Reviewed-by: mauricek
-rw-r--r--src/network/socket/qlocalserver_tcp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp
index b248f2f..bcf822e 100644
--- a/src/network/socket/qlocalserver_tcp.cpp
+++ b/src/network/socket/qlocalserver_tcp.cpp
@@ -92,7 +92,7 @@ void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut)
{
if (pendingConnections.isEmpty())
tcpServer.waitForNewConnection(msec, timedOut);
- else
+ else if (timedOut)
*timedOut = false;
}