[pvr] fixed - don't try to switch windows in CPVRManager::Stop() since this can be...

diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
index dcff83a..bf281d8 100644 (file)
--- a/xbmc/pvr/PVRManager.cpp
+++ b/xbmc/pvr/PVRManager.cpp
@@ -277,9 +277,6 @@ void CPVRManager::Stop(void)
 
   SetState(ManagerStateStopping);
 
-  if (g_windowManager.GetActiveWindow() == WINDOW_PVR)
-    g_windowManager.ActivateWindow(WINDOW_HOME);
-
   /* stop the EPG updater, since it might be using the pvr add-ons */
   g_EpgContainer.Stop();
 
@@ -379,6 +376,11 @@ void CPVRManager::Process(void)
     CLog::Log(LOGNOTICE, "PVRManager - %s - no add-ons enabled anymore. restarting the pvrmanager", __FUNCTION__);
     CApplicationMessenger::Get().ExecBuiltIn("StartPVRManager", false);
   }
+  else
+  {
+    if (g_windowManager.GetActiveWindow() == WINDOW_PVR)
+      g_windowManager.ActivateWindow(WINDOW_HOME);
+  }
 }
 
 bool CPVRManager::SetWakeupCommand(void)