diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-23 16:06:00 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-23 16:06:00 (GMT) |
| commit | 2bfde77e07c1de1866a1d171fc5dc5c584618e8e (patch) | |
| tree | a38ead931add61ba1b8dbb2eb0ad495a59aaf35f /src/network | |
| parent | ec2d71f0e4af0e0c286f0027d0242f456fdb2bb6 (diff) | |
| parent | 5423ba187c62ea861ccfcc013fb15fcc4a5ae28d (diff) | |
| download | Qt-2bfde77e07c1de1866a1d171fc5dc5c584618e8e.zip Qt-2bfde77e07c1de1866a1d171fc5dc5c584618e8e.tar.gz Qt-2bfde77e07c1de1866a1d171fc5dc5c584618e8e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
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())); } |