aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/Application.cpp2
-rw-r--r--xbmc/ServiceManager.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index c983953241..7abd20fb77 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -1150,8 +1150,6 @@ bool CApplication::Initialize()
// the startup window is considered part of the initialization as it most likely switches to the final window
uiInitializationFinished = firstWindow != WINDOW_STARTUP_ANIM;
- CStereoscopicsManager::GetInstance().Initialize();
-
if (!m_ServiceManager->InitStageThree())
{
CLog::Log(LOGERROR, "Application - Init3 failed");
diff --git a/xbmc/ServiceManager.cpp b/xbmc/ServiceManager.cpp
index 5a09b61df6..412c37c48c 100644
--- a/xbmc/ServiceManager.cpp
+++ b/xbmc/ServiceManager.cpp
@@ -230,6 +230,9 @@ bool CServiceManager::StartAudioEngine()
// stage 3 is called after successful initialization of WindowManager
bool CServiceManager::InitStageThree()
{
+ m_stereoscopicsManager.reset(new CStereoscopicsManager);
+ m_stereoscopicsManager->Initialize();
+
// Peripherals depends on strings being loaded before stage 3
m_peripherals->Initialise();
@@ -258,6 +261,7 @@ void CServiceManager::DeinitStageThree()
m_contextMenuManager->Deinit();
m_gameServices.reset();
m_peripherals->Clear();
+ m_stereoscopicsManager.reset();
}
void CServiceManager::DeinitStageTwo()