summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@trolltech.com>2009-05-27 17:21:53 +0200
committerPeter Hartmann <peter.hartmann@trolltech.com>2009-05-27 17:41:57 +0200
commit2be3c937fdca26287f74dd58cc217cb51924cf8a (patch)
treef23aef91e850a078fe4aeef96f62970e52bd69da /src/network
parente24868e99ef0ffd8e5690761a798d731c4b71b26 (diff)
QNetworkReply internals: do not assert when aborted and reading data
...but just silently return. This is ok because at another location in QNetworkReplyImplPrivate we do the same. Reviewed-by: Thiago Task-number: 254638
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 79c3d1a3a4..6f715e55a1 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -382,7 +382,8 @@ void QNetworkReplyImplPrivate::feed(const QByteArray &data)
void QNetworkReplyImplPrivate::feed(QIODevice *data)
{
Q_Q(QNetworkReplyImpl);
- Q_ASSERT(q->isOpen());
+ if (!q->isOpen())
+ return;
// read until EOF from data
if (copyDevice) {