summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-12 21:59:46 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-12 21:59:46 (GMT)
commitf129de853154dc1d72cb5651606ca009c3b1f814 (patch)
tree8d500bcf8e6ef1f6a5f4ea0bc63f1810e6b167ff /src/network/access
parent1aa4cfab2d437210b8c0b064fa3bd071e53374c1 (diff)
parent0293aff5c44202e5c62e229b74d8bd0bf9206185 (diff)
downloadQt-f129de853154dc1d72cb5651606ca009c3b1f814.zip
Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.gz
Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.bz2
Merge branch '4.5' into 4.6
Conflicts: tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 1dad58c..83afddd 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -582,10 +582,6 @@ void QNetworkReplyImpl::abort()
return;
// stop both upload and download
- if (d->backend) {
- d->backend->deleteLater();
- d->backend = 0;
- }
if (d->outgoingData)
disconnect(d->outgoingData, 0, this, 0);
if (d->copyDevice)
@@ -599,6 +595,12 @@ void QNetworkReplyImpl::abort()
d->finished();
}
d->state = QNetworkReplyImplPrivate::Aborted;
+
+ // finished may access the backend
+ if (d->backend) {
+ d->backend->deleteLater();
+ d->backend = 0;
+ }
}
void QNetworkReplyImpl::close()