diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
| commit | 53b018a42813e44787aa1edc35d59feaa86cf9d7 (patch) | |
| tree | 7cce8f18faf26a87cfb5f27d1417c2a2ec86470c /src/network/bearer/qnetworksession.cpp | |
| parent | 55c32b91a298d52bd7c29968d21b4b7a5ee741e4 (diff) | |
| parent | afa22a20c1b89960b647b0e3a9dc390fe6f87eae (diff) | |
| download | Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.zip Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.gz Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/network/bearer/qnetworksession.cpp')
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 226c3c5..db1a37c 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -310,8 +310,9 @@ bool QNetworkSession::waitForOpened(int msecs) if (d->isOpen) return true; - if (d->state != Connecting) + if (!(d->state == Connecting || d->state == Connected)) { return false; + } QEventLoop* loop = new QEventLoop(this); QObject::connect(d, SIGNAL(quitPendingWaitsForOpened()), |