1 files changed, 19 insertions, 4 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 8a0a944..81cd548 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -446,6 +446,7 @@ bool QNetworkReplyImplPrivate::isCachingEnabled() const
 
 void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
 {
+    Q_Q(QNetworkReplyImpl);
     if (!enable && !cacheEnabled)
         return;                 // nothing to do
     if (enable && cacheEnabled)
@@ -468,15 +469,27 @@ void QNetworkReplyImplPrivate::setCachingEnabled(bool enable)
         networkCache()->remove(url);
         cacheSaveDevice = 0;
         cacheEnabled = false;
+        QObject::disconnect(networkCache(), SIGNAL(destroyed()), q, SLOT(_q_cacheDestroyed()));
     }
 }
 
+void QNetworkReplyImplPrivate::_q_cacheDestroyed()
+{
+    //destruction of cache invalidates cacheSaveDevice
+    cacheSaveDevice = 0;
+    cacheEnabled = false;
+}
+
 void QNetworkReplyImplPrivate::completeCacheSave()
 {
-    if (cacheEnabled && errorCode != QNetworkReplyImpl::NoError) {
-        networkCache()->remove(url);
-    } else if (cacheEnabled && cacheSaveDevice) {
-        networkCache()->insert(cacheSaveDevice);
+    Q_Q(QNetworkReplyImpl);
+    if (cacheEnabled) {
+        if (errorCode != QNetworkReplyImpl::NoError) {
+            networkCache()->remove(url);
+        } else if (cacheSaveDevice) {
+            networkCache()->insert(cacheSaveDevice);
+        }
+        QObject::disconnect(networkCache(), SIGNAL(destroyed()), q, SLOT(_q_cacheDestroyed()));
     }
     cacheSaveDevice = 0;
     cacheEnabled = false;
@@ -536,6 +549,8 @@ void QNetworkReplyImplPrivate::initCacheSaveDevice()
         networkCache()->remove(url);
         cacheSaveDevice = 0;
         cacheEnabled = false;
+    } else {
+        q->connect(networkCache(), SIGNAL(destroyed()), SLOT(_q_cacheDestroyed()));
     }
 }