From 83003d02704f0766489498f171782ce41ee6569c Mon Sep 17 00:00:00 2001
From: Boernsman <bernhard.trinnes@guh.io>
Date: Fri, 18 Oct 2019 18:46:26 +0200
Subject: [PATCH] fixed deleting of pending browse requests

---
 sonos/devicepluginsonos.cpp  | 11 +++++------
 sonos/devicepluginsonos.h    |  1 -
 sonos/devicepluginsonos.json |  5 -----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/sonos/devicepluginsonos.cpp b/sonos/devicepluginsonos.cpp
index 16c0ce99..fb2bbd21 100644
--- a/sonos/devicepluginsonos.cpp
+++ b/sonos/devicepluginsonos.cpp
@@ -24,6 +24,8 @@
 #include "devices/device.h"
 #include "network/networkaccessmanager.h"
 #include "plugininfo.h"
+#include "types/mediabrowseritem.h"
+
 
 #include <QNetworkRequest>
 #include <QNetworkReply>
@@ -353,6 +355,7 @@ void DevicePluginSonos::browseDevice(BrowseResult *result)
     } else if (result->itemId() == "favorites") {
         sonosConnection->getFavorites(householdId);
         m_pendingBrowseResult.insert(householdId, result);
+        connect(result, &BrowseResult::aborted,[householdId, this](){m_pendingBrowseResult.remove(householdId);});
     } else {
         //TODO add media browsing
         result->finish(Device::DeviceErrorItemNotFound);
@@ -374,11 +377,7 @@ void DevicePluginSonos::executeBrowserItem(BrowserActionInfo *info)
     QString groupId = info->device()->paramValue(sonosGroupDeviceGroupIdParamTypeId).toString();
     QUuid requestId = sonosConnection->loadFavorite(groupId, info->browserAction().itemId());
     m_pendingBrowserExecution.insert(requestId, info);
-}
-
-void DevicePluginSonos::executeBrowserItemAction(BrowserItemActionInfo *info)
-{
-    Q_UNUSED(info)
+    connect(info, &BrowserActionInfo::aborted,[requestId, this](){m_pendingBrowserExecution.remove(requestId);});
 }
 
 void DevicePluginSonos::onConnectionChanged(bool connected)
@@ -428,7 +427,7 @@ void DevicePluginSonos::onFavouritesReceived(const QString &householdId, QList<S
             return;
 
         foreach(Sonos::FavouriteObject favourite, favourites)  {
-            BrowserItem item;
+            MediaBrowserItem item;
             item.setId(favourite.id);
             item.setExecutable(true);
             item.setBrowsable(false);
diff --git a/sonos/devicepluginsonos.h b/sonos/devicepluginsonos.h
index 97e6c6d6..9e0c76fa 100644
--- a/sonos/devicepluginsonos.h
+++ b/sonos/devicepluginsonos.h
@@ -52,7 +52,6 @@ public:
     void browseDevice(BrowseResult *result) override;
     void browserItem(BrowserItemResult *result) override;
     void executeBrowserItem(BrowserActionInfo *info) override;
-    void executeBrowserItemAction(BrowserItemActionInfo *info) override;
 
 private:
     PluginTimer *m_pluginTimer5sec = nullptr;
diff --git a/sonos/devicepluginsonos.json b/sonos/devicepluginsonos.json
index 2621d84e..ed5534e4 100644
--- a/sonos/devicepluginsonos.json
+++ b/sonos/devicepluginsonos.json
@@ -213,11 +213,6 @@
                         }
                     ],
                     "browserItemActionTypes": [
-                        {
-                            "id": "b056af0f-4d5b-4f75-b0dd-e73246d3a83f",
-                            "name": "updateLibrary",
-                            "displayName": "Update library"
-                        }
                     ]
                 }
             ]