diff options
author | Jonathan Liu <net147@gmail.com> | 2010-11-26 09:20:56 (GMT) |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-11-26 10:10:13 (GMT) |
commit | 0bf8f70f85a24ab2864775bdd38f5ced43a7d4de (patch) | |
tree | a065683fe2abd91d4127f320d85140099dd56281 | |
parent | 85f42777111060037476895ed08ded513d44a048 (diff) | |
download | Qt-0bf8f70f85a24ab2864775bdd38f5ced43a7d4de.zip Qt-0bf8f70f85a24ab2864775bdd38f5ced43a7d4de.tar.gz Qt-0bf8f70f85a24ab2864775bdd38f5ced43a7d4de.tar.bz2 |
QLocalSocket/Win: do not emit error() when no error actually occurred
This fixes a regression in 4d0c4b9f09b35d707d437611519d0024f6f87a8c.
Previously the error string was set if the error is not
ERROR_PIPE_NOT_CONNECTED but the commit changed this behaviour to set
the error string if it is ERROR_PIPE_NOT_CONNECTED.
Task-number: QTBUG-13646
Merge-request: 941
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 4907f2c..6c3b769 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -322,9 +322,9 @@ bool QLocalSocketPrivate::completeAsyncRead() // buffer. We will read the remaining data in the next call. break; case ERROR_PIPE_NOT_CONNECTED: - setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead")); - // fall through + return false; default: + setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead")); return false; } } |