diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 18:32:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 18:32:37 (GMT) |
| commit | 718013958724210915b24142c499154f751f0bac (patch) | |
| tree | 266c7759d181e4431dde92f639460307d48b7b1a /src/network/access | |
| parent | bae78d4a2cc32952a19e4da9f0486af635ea6d47 (diff) | |
| parent | d03a28a289cf0665290e6ea0375b31cbb2d6649e (diff) | |
| download | Qt-718013958724210915b24142c499154f751f0bac.zip Qt-718013958724210915b24142c499154f751f0bac.tar.gz Qt-718013958724210915b24142c499154f751f0bac.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM: Re-order checks in migrateBackend()
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 894df79..069755f 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -913,10 +913,6 @@ bool QNetworkReplyImplPrivate::migrateBackend() if (state == Finished || state == Aborted) return true; - // Backend does not support resuming download. - if (!backend->canResume()) - return false; - // Request has outgoing data, not migrating. if (outgoingData) return false; @@ -925,6 +921,10 @@ bool QNetworkReplyImplPrivate::migrateBackend() if (copyDevice) return true; + // Backend does not support resuming download. + if (!backend->canResume()) + return false; + state = QNetworkReplyImplPrivate::Reconnecting; if (backend) { |