diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 14:48:02 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 14:48:02 (GMT) |
| commit | 6744a0d6095277e1876694cc8fe42b41997c6c31 (patch) | |
| tree | 80892dc90afc9c18c859a9ebc239216b14f0dba4 /src/network | |
| parent | f7a11ee28484320129fec25c00e0f616ff6751bc (diff) | |
| parent | cb3bddc9a5e4a664500eec3997dedadd67de3652 (diff) | |
| download | Qt-6744a0d6095277e1876694cc8fe42b41997c6c31.zip Qt-6744a0d6095277e1876694cc8fe42b41997c6c31.tar.gz Qt-6744a0d6095277e1876694cc8fe42b41997c6c31.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/network/access/qnetworkaccesshttpbackend.cpp
src/network/access/qnetworkreplyimpl.cpp
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 28319bb..b11d986 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -91,6 +91,8 @@ void QNetworkReplyImplPrivate::_q_startOperation() void QNetworkReplyImplPrivate::_q_copyReadyRead() { Q_Q(QNetworkReplyImpl); + if (state != Working) + return; if (!copyDevice || !q->isOpen()) return; |