[application] Moved call to PVRManager::SetWakeupCommand in PowerManager::OnSleep...

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index d3cd8bf..9ef120c 100644 (file)
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2536,12 +2536,10 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
   break;
 
   case TMSG_HIBERNATE:
-    g_PVRManager.SetWakeupCommand();
     g_powerManager.Hibernate();
     break;
 
   case TMSG_SUSPEND:
-    g_PVRManager.SetWakeupCommand();
     g_powerManager.Suspend();
     break;
 

diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
index d8b927a..54f8290 100644 (file)
--- a/xbmc/powermanagement/PowerManager.cpp
+++ b/xbmc/powermanagement/PowerManager.cpp
@@ -35,6 +35,7 @@
 #include "guilib/GUIWindowManager.h"
 #include "dialogs/GUIDialogBusy.h"
 #include "dialogs/GUIDialogKaiToast.h"
+#include "pvr/PVRManager.h"
 
 #if defined(TARGET_DARWIN)
 #include "osx/CocoaPowerSyscall.h"
@@ -250,6 +251,7 @@ void CPowerManager::OnSleep()
   CBuiltins::Execute("LIRC.Stop");
 #endif
 
+  PVR::CPVRManager::Get().SetWakeupCommand();
   g_application.SaveFileState(true);
   g_application.StopPlaying();
   g_application.StopShutdownTimer();