4 files changed, 15 insertions, 5 deletions
diff --git a/xbmc/pvr/PVRComponentRegistration.cpp b/xbmc/pvr/PVRComponentRegistration.cpp
index 71ac975934..13d80e22d9 100644
--- a/xbmc/pvr/PVRComponentRegistration.cpp
+++ b/xbmc/pvr/PVRComponentRegistration.cpp
@@ -9,6 +9,7 @@
 #include "PVRComponentRegistration.h"
 
 #include "pvr/guilib/PVRGUIActionsChannels.h"
+#include "pvr/guilib/PVRGUIActionsClients.h"
 
 #include <memory>
 
@@ -17,9 +18,11 @@ using namespace PVR;
 CPVRComponentRegistration::CPVRComponentRegistration()
 {
   RegisterComponent(std::make_shared<CPVRGUIActionsChannels>());
+  RegisterComponent(std::make_shared<CPVRGUIActionsClients>());
 }
 
 CPVRComponentRegistration::~CPVRComponentRegistration()
 {
+  DeregisterComponent(typeid(CPVRGUIActionsClients));
   DeregisterComponent(typeid(CPVRGUIActionsChannels));
 }
diff --git a/xbmc/pvr/guilib/PVRGUIActionListener.cpp b/xbmc/pvr/guilib/PVRGUIActionListener.cpp
index 302148537d..10fa783bd5 100644
--- a/xbmc/pvr/guilib/PVRGUIActionListener.cpp
+++ b/xbmc/pvr/guilib/PVRGUIActionListener.cpp
@@ -26,6 +26,7 @@
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/guilib/PVRGUIActions.h"
 #include "pvr/guilib/PVRGUIActionsChannels.h"
+#include "pvr/guilib/PVRGUIActionsClients.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
 #include "settings/lib/Setting.h"
@@ -380,7 +381,7 @@ void CPVRGUIActionListener::OnSettingAction(const std::shared_ptr<const CSetting
   }
   else if (settingId == CSettings::SETTING_PVRCLIENT_MENUHOOK)
   {
-    CServiceBroker::GetPVRManager().GUIActions()->ProcessSettingsMenuHooks();
+    CServiceBroker::GetPVRManager().Get<PVR::GUI::Clients>().ProcessSettingsMenuHooks();
   }
   else if (settingId == CSettings::SETTING_PVRMANAGER_ADDONS)
   {
diff --git a/xbmc/pvr/guilib/PVRGUIActions.h b/xbmc/pvr/guilib/PVRGUIActions.h
index f47a9ffd45..6d7821b0c2 100644
--- a/xbmc/pvr/guilib/PVRGUIActions.h
+++ b/xbmc/pvr/guilib/PVRGUIActions.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "pvr/guilib/PVRGUIActionsClients.h"
 #include "pvr/guilib/PVRGUIActionsDatabase.h"
 #include "pvr/guilib/PVRGUIActionsEPG.h"
 #include "pvr/guilib/PVRGUIActionsParentalControl.h"
@@ -20,8 +19,7 @@
 
 namespace PVR
 {
-class CPVRGUIActions : public CPVRGUIActionsClients,
-                       public CPVRGUIActionsDatabase,
+class CPVRGUIActions : public CPVRGUIActionsDatabase,
                        public CPVRGUIActionsEPG,
                        public CPVRGUIActionsParentalControl,
                        public CPVRGUIActionsPlayback,
diff --git a/xbmc/pvr/guilib/PVRGUIActionsClients.h b/xbmc/pvr/guilib/PVRGUIActionsClients.h
index 2e5d9147aa..e73d59efc3 100644
--- a/xbmc/pvr/guilib/PVRGUIActionsClients.h
+++ b/xbmc/pvr/guilib/PVRGUIActionsClients.h
@@ -8,9 +8,11 @@
 
 #pragma once
 
+#include "pvr/IPVRComponent.h"
+
 namespace PVR
 {
-class CPVRGUIActionsClients
+class CPVRGUIActionsClients : public IPVRComponent
 {
 public:
   CPVRGUIActionsClients() = default;
@@ -27,4 +29,10 @@ private:
   CPVRGUIActionsClients const& operator=(CPVRGUIActionsClients const&) = delete;
 };
 
+namespace GUI
+{
+// pretty scope and name
+using Clients = CPVRGUIActionsClients;
+} // namespace GUI
+
 } // namespace PVR