From 478f319df95321a1569f8f3c1ce1fe0847abfbbd Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 16 Feb 2015 08:52:36 +0100 Subject: LocalSocket: Do not return early in waitForReadyRead Do not return early on Windows if bytes are still in the buffer. This is not in line with the behavior on other platforms, and also breaks apps where the caller knows that the bytes available are insufficient. [ChangeLog][Network][QLocalSocket] On Windows, waitForReadyRead now always waits for more data, even if bytes are still in the buffer. Task-number: QTBUG-16688 Change-Id: I1425a5780c7707295374934a6b5446ff8e148cc8 Reviewed-by: Oswald Buddenhagen --- src/network/socket/qlocalsocket_win.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 423ea99d04..ae39f78fe8 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -405,9 +405,6 @@ bool QLocalSocket::waitForReadyRead(int msecs) { Q_D(QLocalSocket); - if (bytesAvailable() > 0) - return true; - if (d->state != QLocalSocket::ConnectedState) return false; -- cgit v1.2.3