summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-12-15 14:34:35 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-12-15 14:34:35 (GMT)
commitc50ef702872ee7adf8860bf164be6d092d8bde0f (patch)
tree0359d427ef4d67323bae485f5d3118e5b4564469 /src/network/socket
parent4d86bacafad3b12ca01c20988bf578cde7bf3dae (diff)
parent567bcd38dd7a749ac0bc3cdd2432798ab1af74fe (diff)
downloadQt-c50ef702872ee7adf8860bf164be6d092d8bde0f.zip
Qt-c50ef702872ee7adf8860bf164be6d092d8bde0f.tar.gz
Qt-c50ef702872ee7adf8860bf164be6d092d8bde0f.tar.bz2
Merge remote branch 'qt/master' into symbian-socket-engine
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qlocalsocket_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 1e0bced..5b42578 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;
}
}