summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkaccessbackend.cpp
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-13 09:34:23 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-13 09:34:23 (GMT)
commitece530b88059cdfb166a99bba95ef4b70ce4ec66 (patch)
tree7af49213a328dfb6a09fbac8f27334d0737430b4 /src/network/access/qnetworkaccessbackend.cpp
parent6b84baddfb5187219b76d0d9a112db27bee29d2c (diff)
parentf7a1117cbec5638e32ea04b6a93412b193e07913 (diff)
downloadQt-ece530b88059cdfb166a99bba95ef4b70ce4ec66.zip
Qt-ece530b88059cdfb166a99bba95ef4b70ce4ec66.tar.gz
Qt-ece530b88059cdfb166a99bba95ef4b70ce4ec66.tar.bz2
Merge commit 'coreteam/4.6' into oslo1-4.6
Diffstat (limited to 'src/network/access/qnetworkaccessbackend.cpp')
-rw-r--r--src/network/access/qnetworkaccessbackend.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 1a92868..3e2db7a 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -141,6 +141,8 @@ QNonContiguousByteDevice* QNetworkAccessBackend::createUploadByteDevice()
// and the special backends need to access this.
void QNetworkAccessBackend::emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal)
{
+ if (reply->isFinished())
+ return;
reply->emitUploadProgress(bytesSent, bytesTotal);
}