From ab5d9b62b828222512d071978040985f9d7424a2 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 15 Sep 2018 22:34:44 +0200
Subject: [PATCH] Fix search error not shown in Tidal search

---
 src/tidal/tidalservice.cpp | 9 +++++++--
 src/tidal/tidalservice.h   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index 8b7c0728..76f0e832 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -229,7 +229,7 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int search_id) {
   }
 
   if ( !json_obj.contains("userId") || !json_obj.contains("sessionId") || !json_obj.contains("countryCode") ) {
-    QString failure_reason = tr("Authentication reply from server is missing userId, sessionId or countryCode");
+    QString failure_reason("Authentication reply from server is missing userId, sessionId or countryCode");
     if (search_id != 0) Error(failure_reason);
     emit LoginFailure(failure_reason);
     return;
@@ -846,8 +846,13 @@ void TidalService::GetStreamURLFinished(QNetworkReply *reply, const int search_i
 
 void TidalService::CheckFinish() {
 
+  if (search_id_ == 0) return;
+
   if (!login_sent_ && albums_requested_ <= albums_received_ && songs_requested_ <= songs_received_) {
-    if (songs_.isEmpty()) emit SearchError(search_id_, search_error_);
+    if (songs_.isEmpty()) {
+      if (search_error_.isEmpty()) emit SearchError(search_id_, "Unknown error");
+      else emit SearchError(search_id_, search_error_);
+    }
     else emit SearchResults(search_id_, songs_);
     ClearSearch();
   }
diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h
index 67625ca9..95f1b949 100644
--- a/src/tidal/tidalservice.h
+++ b/src/tidal/tidalservice.h
@@ -93,7 +93,7 @@ class TidalService : public InternetService {
   Song ParseSong(const int album_id_requested, const QJsonValue &value);
   void GetStreamURL(const int album_id, const int song_id);
   void CheckFinish();
-  void Error(QString error, QString debug = "");
+  void Error(QString error, QString debug = QString());
 
   static const char *kApiUrl;
   static const char *kAuthUrl;