From 5ec33ec8210cfae0aceb81254566c1d706f9eea6 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 9 Aug 2020 01:50:03 +0200
Subject: [PATCH] Tidal: Show API error instead of network error when available

---
 src/tidal/tidalbaserequest.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp
index a82c4078a..12146efad 100644
--- a/src/tidal/tidalbaserequest.cpp
+++ b/src/tidal/tidalbaserequest.cpp
@@ -112,11 +112,13 @@ QByteArray TidalBaseRequest::GetReplyData(QNetworkReply *reply, const bool send_
           error = QString("%1 (%2) (%3)").arg(user_message).arg(status).arg(sub_status);
         }
       }
-      if (reply->error() != QNetworkReply::NoError) {
-        error = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
-      }
-      else {
-        error = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
+      if (error.isEmpty()) {
+        if (reply->error() != QNetworkReply::NoError) {
+          error = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
+        }
+        else {
+          error = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
+        }
       }
       if (status == 401 && sub_status == 6001) {  // User does not have a valid session
         emit service_->Logout();