diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-15 13:15:13 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-15 13:15:13 (GMT) |
| commit | b5b3e65f6e0392239621a3888d9aa58746f3899e (patch) | |
| tree | 5c33473950b22db0a0eb9c230005cd8e7f251538 /src/network/access/qnetworkreplyimpl.cpp | |
| parent | cace8e6a9f00ee478dfe63a7fa6959056cfe7e8a (diff) | |
| parent | 0c6780c39d18a4fd06b9bed94400de365a518c45 (diff) | |
| download | Qt-b5b3e65f6e0392239621a3888d9aa58746f3899e.zip Qt-b5b3e65f6e0392239621a3888d9aa58746f3899e.tar.gz Qt-b5b3e65f6e0392239621a3888d9aa58746f3899e.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Diffstat (limited to 'src/network/access/qnetworkreplyimpl.cpp')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index cf6e674..3d1df06 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -271,8 +271,8 @@ void QNetworkReplyImplPrivate::_q_networkSessionConnected() void QNetworkReplyImplPrivate::_q_networkSessionFailed() { - // Abort waiting replies. - if (state == WaitingForSession) { + // Abort waiting and working replies. + if (state == WaitingForSession || state == Working) { state = Working; error(QNetworkReplyImpl::UnknownNetworkError, QCoreApplication::translate("QNetworkReply", "Network session error.")); |