From d238b0ba236da4c3c33c0707d8dd6f5e5903d6c0 Mon Sep 17 00:00:00 2001
From: Ville Pernu <ville.pernu@nokia.com>
Date: Fri, 17 Dec 2010 11:08:53 +0200
Subject: Fix waitForOpened not working with already active configuration

When an active QNetworkConfiguration is already in use (e.g. browser
already open), the QNetworkSession::waitForOpened() did not work
properly. Changed one if-statement in the function to adapt to the
scenario.

Reviewed-by: Perttu Pohjonen
Task-number: QTBUG-565
---
 src/network/bearer/qnetworksession.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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()),
-- 
cgit v0.12