summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2011-04-01 16:35:28 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:24:57 (GMT)
commitfbd7d47cf41400e0b0f5e8aedee9b0ef67f2f5d5 (patch)
tree33575853c8ab43e5c89f092a35cc6eda16e223d1 /src
parent3b1b24d0ba64af705c6d80db9452358d52c9e4ff (diff)
downloadQt-fbd7d47cf41400e0b0f5e8aedee9b0ef67f2f5d5.zip
Qt-fbd7d47cf41400e0b0f5e8aedee9b0ef67f2f5d5.tar.gz
Qt-fbd7d47cf41400e0b0f5e8aedee9b0ef67f2f5d5.tar.bz2
fix QLocalSocket::isValid() on Windows
This function always returned false, even if the socket was connected. Task-number: QTBUG-18204 Reviewed-by: Martin Petersson
Diffstat (limited to 'src')
-rw-r--r--src/network/socket/qlocalsocket_win.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index c4fc4c7..f26a7ab 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -574,10 +574,7 @@ bool QLocalSocket::waitForDisconnected(int msecs)
bool QLocalSocket::isValid() const
{
Q_D(const QLocalSocket);
- if (d->handle == INVALID_HANDLE_VALUE)
- return false;
-
- return PeekNamedPipe(d->handle, NULL, 0, NULL, NULL, NULL);
+ return d->handle != INVALID_HANDLE_VALUE;
}
bool QLocalSocket::waitForReadyRead(int msecs)