diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-18 23:00:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-18 23:00:13 (GMT) |
| commit | 8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5 (patch) | |
| tree | a95fbee6c5efc127f1c069804f7d1d1d36c2d06a /src | |
| parent | ab9d11946e5ff88008e8c2d887b8d0458ab9a98c (diff) | |
| parent | f6fd0ec480170713044d39d6ee0ebcf0a6435042 (diff) | |
| download | Qt-8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5.zip Qt-8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5.tar.gz Qt-8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src')
| -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()), |