diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-01-27 14:28:46 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-01 11:33:56 (GMT) |
| commit | 07416116e30ec526506c6f2c97be4499b898dda0 (patch) | |
| tree | 0e2a224c2fa79867a455ab1fbcf4893f65867560 | |
| parent | c546754be723c35a61a8aa5df066aa8dce053d56 (diff) | |
| download | Qt-07416116e30ec526506c6f2c97be4499b898dda0.zip Qt-07416116e30ec526506c6f2c97be4499b898dda0.tar.gz Qt-07416116e30ec526506c6f2c97be4499b898dda0.tar.bz2 | |
Fix for QNetworkSession::waitForOpened failing on active connection
When opening an active session, waitForOpened was failing because
the state was Connected rather than Connecting.
This is fixed to allow Connected as a state.
Reviewed-by: Markus Goetz
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index eac0456..41a8854 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -310,7 +310,7 @@ bool QNetworkSession::waitForOpened(int msecs) if (d->isOpen) return true; - if (d->state != Connecting) + if (d->state != Connecting && d->state != Connected) //state is connected when opening an already active interface return false; QEventLoop loop; |