Skip to content

Commit 0bf8f70

Browse files
net147Joerg Bornemann
authored and
Joerg Bornemann
committed
QLocalSocket/Win: do not emit error() when no error actually occurred
This fixes a regression in 4d0c4b9. 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 <[email protected]>
1 parent 85f4277 commit 0bf8f70

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/network/socket/qlocalsocket_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ bool QLocalSocketPrivate::completeAsyncRead()
322322
// buffer. We will read the remaining data in the next call.
323323
break;
324324
case ERROR_PIPE_NOT_CONNECTED:
325-
setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead"));
326-
// fall through
325+
return false;
327326
default:
327+
setErrorString(QLatin1String("QLocalSocketPrivate::completeAsyncRead"));
328328
return false;
329329
}
330330
}

0 commit comments

Comments
 (0)