diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 15:08:37 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 15:08:37 (GMT) |
commit | 4ec0d20bda2d7c4dfd1da41d52404481f5ecd42c (patch) | |
tree | e1ea07496c1e9e83305c412e31b718f9d31092d9 /src/network | |
parent | ff4864e079accef109a8a45e9754f7ac34718ec5 (diff) | |
parent | 5a46b82feea371868a9c793f6df14d92654c2423 (diff) | |
download | Qt-4ec0d20bda2d7c4dfd1da41d52404481f5ecd42c.zip Qt-4ec0d20bda2d7c4dfd1da41d52404481f5ecd42c.tar.gz Qt-4ec0d20bda2d7c4dfd1da41d52404481f5ecd42c.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index e759d0b..39c9284 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -298,7 +298,7 @@ qint64 QLocalSocketPrivate::bytesAvailable() if (PeekNamedPipe(handle, NULL, 0, NULL, &bytes, NULL)) { return bytes; } else { - if (ERROR_BROKEN_PIPE == GetLastError() && !pipeClosed) { + if (!pipeClosed) { pipeClosed = true; QTimer::singleShot(0, q, SLOT(_q_pipeClosed())); } |