Merge pull request #13765 from ksooo/fix-broken-powermanagement

[application] fix broken powermanagement after #13748.
xbmc · Apr 12, 2018 · 2fe8c8b · 2fe8c8b
2 parents 9edd874 + 2a48d0d
commit 2fe8c8b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -586,15 +586,15 @@ bool CApplication::Create(const CAppParamParser &params)
   CWIN32Util::SetThreadLocalLocale(true); // enable independent locale for each thread, see https://connect.microsoft.com/VisualStudio/feedback/details/794122
 #endif // TARGET_WINDOWS
 
+  // audio (OSX) depends on WinSystem
+  m_pWinSystem = CWinSystemBase::CreateWinSystem();
+  CServiceBroker::RegisterWinSystem(m_pWinSystem.get());
+
   if (!m_ServiceManager->InitStageTwo(params))
   {
     return false;
   }
 
-  // audio (OSX) depends on WinSystem
-  m_pWinSystem = CWinSystemBase::CreateWinSystem();
-  CServiceBroker::RegisterWinSystem(m_pWinSystem.get());
-
   m_pActiveAE.reset(new ActiveAE::CActiveAE());
   // start the AudioEngine
   if (!m_pActiveAE->Initialize())