Commit 1b459a81 authored by Kai Koehne's avatar Kai Koehne
Browse files

QAbstractSocket: Always set errorString right after socketError


Otherwise errorString() might not match error() in a
statusChanged handler.

Change-Id: If1250b4552412eabe88457dee031e4ef3f533838
Reviewed-by: default avatarAlex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: default avatarThiago Macieira <thiago.macieira@intel.com>
Showing with 1 addition and 1 deletion
...@@ -2086,10 +2086,10 @@ bool QAbstractSocket::waitForConnected(int msecs) ...@@ -2086,10 +2086,10 @@ bool QAbstractSocket::waitForConnected(int msecs)
if ((timedOut && state() != ConnectedState) || state() == ConnectingState) { if ((timedOut && state() != ConnectedState) || state() == ConnectingState) {
d->socketError = SocketTimeoutError; d->socketError = SocketTimeoutError;
setErrorString(tr("Socket operation timed out"));
d->state = UnconnectedState; d->state = UnconnectedState;
emit stateChanged(d->state); emit stateChanged(d->state);
d->resetSocketLayer(); d->resetSocketLayer();
setErrorString(tr("Socket operation timed out"));
} }
#if defined (QABSTRACTSOCKET_DEBUG) #if defined (QABSTRACTSOCKET_DEBUG)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment