From c2b9767dfc0fb2f26ff52bdded36c76c0a23f938 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 11 Feb 2010 12:42:42 +1000 Subject: Fix after reworking to use signals/slots. --- src/network/access/qnetworkaccessmanager.cpp | 2 -- src/network/access/qnetworkreplyimpl.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 3324e09..9c1e268 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1139,8 +1139,6 @@ void QNetworkAccessManagerPrivate::_q_networkSessionPreferredConfigurationChange { Q_Q(QNetworkAccessManager); - emit q->networkSessionOnline(); - networkSession->migrate(); } diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index afa7307..81d4d0d 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -574,7 +574,7 @@ void QNetworkReplyImplPrivate::finished() if (migrateBackend()) { // either we are migrating or the request is finished/aborted - if (state == Reconnecting) { + if (state == Reconnecting || state == WaitingForSession) { resumeNotificationHandling(); return; // exit early if we are migrating. } -- cgit v0.12