[PVR,buildins] activate PVR windows only if PVR is enabled

xbmc · Oct 15, 2015 · a060369 · a060369
1 parent 04ada40
commit a060369
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/xbmc/interfaces/builtins/GUIBuiltins.cpp b/xbmc/interfaces/builtins/GUIBuiltins.cpp
@@ -29,6 +29,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "guilib/StereoscopicsManager.h"
 #include "input/ButtonTranslator.h"
+#include "pvr/PVRManager.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
 #include "utils/log.h"
@@ -84,6 +85,12 @@ static int ActivateWindow(const std::vector<std::string>& params2)
   int iWindow = CButtonTranslator::TranslateWindow(strWindow);
   if (iWindow != WINDOW_INVALID)
   {
+    if (PVR::CPVRManager::IsPVRWindow(iWindow) && !CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_ENABLED))
+    {
+      // PVR window requested, but PVR disabled.
+      return 0;
+    }
+
     // compate the given directory param with the current active directory
     bool bIsSameStartFolder = true;
     if (!params.empty())