Spotify requests are now always sent from the main thread

PhilInTheGaps · Dec 20, 2023 · a7340be · a7340be
1 parent 67304dd
commit a7340be
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/services/rest/restserviceconnectorlocal.cpp b/src/services/rest/restserviceconnectorlocal.cpp
@@ -93,6 +93,17 @@ void RESTServiceConnectorLocal::disconnectService()
 
 void RESTServiceConnectorLocal::sendRequest(RestRequest &&container, QPromise<RestReply> &&promise)
 {
+    if (QThread::currentThread() != this->thread())
+    {
+        QMetaObject::invokeMethod(
+            this,
+            [this, container = std::move(container), promise = std::move(promise)]() mutable {
+                sendRequest(std::move(container), std::move(promise));
+            },
+            Qt::ConnectionType::QueuedConnection);
+        return;
+    }
+
     auto *requestor = makeRequestor();
     auto request = container.request();
 

diff --git a/src/services/spotify/spotifyconnectorserver.cpp b/src/services/spotify/spotifyconnectorserver.cpp
@@ -53,6 +53,17 @@ void SpotifyConnectorServer::disconnectService()
 
 void SpotifyConnectorServer::sendRequest(RestRequest &&container, QPromise<RestReply> &&promise)
 {
+    if (QThread::currentThread() != this->thread())
+    {
+        QMetaObject::invokeMethod(
+            this,
+            [this, container = std::move(container), promise = std::move(promise)]() mutable {
+                sendRequest(std::move(container), std::move(promise));
+            },
+            Qt::ConnectionType::QueuedConnection);
+        return;
+    }
+
     auto request = container.options().testFlag(Services::Option::Authenticated) ? addAuthHeader(container.request())
                                                                                  : container.request();
     QNetworkReply *reply = nullptr;