diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2021-01-07 19:40:27 +0100 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2021-01-07 20:32:37 +0100 |
commit | 0d3d483acc17426bcb36431e808f60c32cbd3f6e (patch) | |
tree | 6ae233cf9c69655da7d91c78cbd4bfaab8150d36 /src/network | |
parent | 4bbc96c0203b1d8834738bc1e1330866b2b8bed3 (diff) |
Do not try to read from failed network replies
Fixes QIODevice::read (QNetworkReplyHttpImpl): device not open
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/networktask.cpp | 9 | ||||
-rw-r--r-- | src/network/networktask.h | 6 | ||||
-rw-r--r-- | src/network/webtask.cpp | 12 | ||||
-rw-r--r-- | src/network/webtask.h | 3 |
4 files changed, 10 insertions, 20 deletions
diff --git a/src/network/networktask.cpp b/src/network/networktask.cpp index 9dc25df338..acd0823b83 100644 --- a/src/network/networktask.cpp +++ b/src/network/networktask.cpp @@ -81,8 +81,7 @@ void NetworkTask::emitAborted( void NetworkTask::emitNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent) { + QString&& errorString) { VERIFY_OR_DEBUG_ASSERT( isSignalFuncConnected(&NetworkTask::networkError)) { kLogger.warning() @@ -90,16 +89,14 @@ void NetworkTask::emitNetworkError( << "Unhandled network error signal" << requestUrl << errorCode - << errorString - << errorContent; + << errorString; deleteLater(); return; } emit networkError( std::move(requestUrl), errorCode, - std::move(errorString), - std::move(errorContent)); + std::move(errorString)); } } // namespace network diff --git a/src/network/networktask.h b/src/network/networktask.h index 4721fd2e98..70e74953fc 100644 --- a/src/network/networktask.h +++ b/src/network/networktask.h @@ -57,8 +57,7 @@ class NetworkTask : public QObject { void emitNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent); + QString&& errorString); /// All member variables must only be accessed from /// the event loop thread!! @@ -101,8 +100,7 @@ class NetworkTask : public QObject { void networkError( const QUrl& requestUrl, QNetworkReply::NetworkError errorCode, - const QString& errorString, - const QByteArray& errorContent); + const QString& errorString); }; } // namespace network diff --git a/src/network/webtask.cpp b/src/network/webtask.cpp index daff097c6c..6de7dcc9b1 100644 --- a/src/network/webtask.cpp +++ b/src/network/webtask.cpp @@ -78,8 +78,7 @@ WebTask::WebTask( void WebTask::onNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent) { + QString&& errorString) { DEBUG_ASSERT(m_state == State::Pending); DEBUG_ASSERT(m_timeoutTimerId == kInvalidTimerId); @@ -104,8 +103,7 @@ void WebTask::onNetworkError( emitNetworkError( std::move(requestUrl), errorCode, - std::move(errorString), - std::move(errorContent)); + std::move(errorString)); } } @@ -128,8 +126,7 @@ void WebTask::slotStart(int timeoutMillis) { onNetworkError( QUrl(), QNetworkReply::NetworkSessionFailedError, - tr("No network access"), - QByteArray()); + tr("No network access")); return; } DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(pNetworkAccessManager); @@ -317,8 +314,7 @@ void WebTask::slotNetworkReplyFinished() { onNetworkError( pFinishedNetworkReply->request().url(), pFinishedNetworkReply->error(), - pFinishedNetworkReply->errorString(), - pFinishedNetworkReply->readAll()); + pFinishedNetworkReply->errorString()); DEBUG_ASSERT(hasTerminated()); return; } diff --git a/src/network/webtask.h b/src/network/webtask.h index 69e8bf3599..7d364c1afb 100644 --- a/src/network/webtask.h +++ b/src/network/webtask.h @@ -171,8 +171,7 @@ class WebTask : public NetworkTask { void onNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent); + QString&& errorString); /// All member variables must only be accessed from /// the event loop thread!! |