summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkaccessmanager_p.h
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-02-22 15:40:19 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-02-22 15:53:48 (GMT)
commit7f41f062e05c02ddf31ab6b81444f57904614f2a (patch)
tree94042c0ae9afc05143f69951e958eaad03463416 /src/network/access/qnetworkaccessmanager_p.h
parentb2c41f756e1c0abd3f07a2e7256c3ba1be72832a (diff)
downloadQt-7f41f062e05c02ddf31ab6b81444f57904614f2a.zip
Qt-7f41f062e05c02ddf31ab6b81444f57904614f2a.tar.gz
Qt-7f41f062e05c02ddf31ab6b81444f57904614f2a.tar.bz2
Fix duplicate calls to _q_startOperation
Because of the shared QNetworkSession, we need to disconnect the signals before detaching from the session. Otherwise we may receive signals from an old session after switching configurations. Also, when a session is connected, we get both the state change (connected) and the opened signals from the session. This needs to be distinguished from the roaming->connected state change to avoid getting the networkSessionConnected signal twice. Reviewed-by: Markus Goetz Task-Number: QTBUG-16901
Diffstat (limited to 'src/network/access/qnetworkaccessmanager_p.h')
-rw-r--r--src/network/access/qnetworkaccessmanager_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
index cf4d2f3..6dcb6da 100644
--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
@@ -77,6 +77,7 @@ public:
#endif
#ifndef QT_NO_BEARERMANAGEMENT
networkSession(0),
+ lastSessionState(QNetworkSession::Invalid),
networkAccessible(QNetworkAccessManager::Accessible),
online(false),
initializeSession(true),
@@ -129,6 +130,7 @@ public:
#ifndef QT_NO_BEARERMANAGEMENT
QSharedPointer<QNetworkSession> networkSession;
+ QNetworkSession::State lastSessionState;
QString networkConfiguration;
QNetworkAccessManager::NetworkAccessibility networkAccessible;
bool online;