From 5ca6513c04d5b1af54d89086500306463808d515 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 28 Oct 2022 21:46:12 +0200
Subject: [PATCH] TidalRequest: Only return error when no songs are received

Fixes #1061
---
 src/tidal/tidalrequest.cpp | 10 +++++-----
 src/tidal/tidalrequest.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp
index fa1210497..b4a119936 100644
--- a/src/tidal/tidalrequest.cpp
+++ b/src/tidal/tidalrequest.cpp
@@ -1254,21 +1254,21 @@ void TidalRequest::FinishCheck() {
       album_covers_received_ >= album_covers_requested_
   ) {
     finished_ = true;
-    if (errors_.isEmpty()) {
-      if (songs_.isEmpty()) {
+    if (songs_.isEmpty()) {
+      if (errors_.isEmpty()) {
         if (IsSearch()) {
           emit Results(query_id_, SongMap(), tr("No match."));
         }
         else {
-          emit Results(query_id_, SongMap(), QString());
+          emit Results(query_id_);
         }
       }
       else {
-        emit Results(query_id_, songs_, QString());
+        emit Results(query_id_, SongMap(), ErrorsToHTML(errors_));
       }
     }
     else {
-      emit Results(query_id_, SongMap(), ErrorsToHTML(errors_));
+      emit Results(query_id_);
     }
   }
 
diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h
index f0f9f7ba1..a75cbe54d 100644
--- a/src/tidal/tidalrequest.h
+++ b/src/tidal/tidalrequest.h
@@ -81,7 +81,7 @@ class TidalRequest : public TidalBaseRequest {
  signals:
   void LoginSuccess();
   void LoginFailure(QString failure_reason);
-  void Results(int id, SongMap songs, QString error);
+  void Results(int id, SongMap songs = SongMap(), QString error = QString());
   void UpdateStatus(int id, QString text);
   void ProgressSetMaximum(int id, int max);
   void UpdateProgress(int id, int max);