diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 10:15:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 10:15:46 (GMT) |
| commit | ca6ed3ab4ebdb4d8f365294a61662edd8da22d34 (patch) | |
| tree | 18006198640b94e4805f74f7cece4983420ff89f /src | |
| parent | 6c8acf656a9293db2fdbad569bb1fa3a83975462 (diff) | |
| parent | fd7d30ec02785084c357cf85c990501fbb97b9cf (diff) | |
| download | Qt-ca6ed3ab4ebdb4d8f365294a61662edd8da22d34.zip Qt-ca6ed3ab4ebdb4d8f365294a61662edd8da22d34.tar.gz Qt-ca6ed3ab4ebdb4d8f365294a61662edd8da22d34.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix crash in QLocalServer::close on Windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/socket/qlocalserver_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp index e820f73..50d6ca4 100644 --- a/src/network/socket/qlocalserver_win.cpp +++ b/src/network/socket/qlocalserver_win.cpp @@ -167,8 +167,8 @@ void QLocalServerPrivate::_q_onNewConnection() q->incomingConnection((quintptr)handle); } else { if (GetLastError() != ERROR_IO_INCOMPLETE) { + q->close(); setError(QLatin1String("QLocalServerPrivate::_q_onNewConnection")); - closeServer(); return; } |