diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
| commit | 00fcb5e473e93546f999e45c78ed940b4d4caeeb (patch) | |
| tree | b84b34de6446e5a5f191fa5a501c63f7106d168a /src/network/access | |
| parent | 3fe6eab1e6e451457b9c060b6b643b86d3f82557 (diff) | |
| parent | 95b0418a7ee7aee9658fd19b363e73d583af0b04 (diff) | |
| download | Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.zip Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.gz Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/network/access')
| -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.")); |