summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-10 16:44:52 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-11 07:48:00 (GMT)
commit3fd024c6d9f0b0998efc44a783ee8390c6494dfa (patch)
tree68d4194c64ccf9f47c22068a86a085cb92cb0cc9
parent22bbc21ba4c838d6afe000e07f70b470acc87d8b (diff)
downloadQt-3fd024c6d9f0b0998efc44a783ee8390c6494dfa.zip
Qt-3fd024c6d9f0b0998efc44a783ee8390c6494dfa.tar.gz
Qt-3fd024c6d9f0b0998efc44a783ee8390c6494dfa.tar.bz2
QLocalSocket (Win) emit readChannelFinished only once
If pipeClosed is true, then we've already emitted the readChannelFinished signal. We must not do this in close() in that case. Reviewed-by: ossi
-rw-r--r--src/network/socket/qlocalsocket_win.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index d6e70be..8a745ab 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -375,7 +375,8 @@ void QLocalSocket::close()
QIODevice::close();
d->state = ClosingState;
emit stateChanged(d->state);
- emit readChannelFinished();
+ if (!d->pipeClosed)
+ emit readChannelFinished();
d->serverName = QString();
d->fullServerName = QString();