Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

game: fix order of init/deinit in ServiceManager #12431

Closed
wants to merge 1 commit into from
Closed

game: fix order of init/deinit in ServiceManager #12431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 13 additions & 6 deletions xbmc/ServiceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@

using namespace KODI;

CServiceManager::CServiceManager() :
m_gameServices(new GAME::CGameServices),
m_peripherals(new PERIPHERALS::CPeripherals),
m_inputManager(new CInputManager)
CServiceManager::CServiceManager()
{
}

Expand All @@ -56,6 +53,10 @@ bool CServiceManager::Init1()
m_announcementManager.reset(new ANNOUNCEMENT::CAnnouncementManager());
m_announcementManager->Start();

m_gameServices.reset(new GAME::CGameServices);
m_peripherals.reset(new PERIPHERALS::CPeripherals);
m_inputManager.reset(new CInputManager);

#ifdef HAS_PYTHON
m_XBPython.reset(new XBPython());
CScriptInvocationManager::GetInstance().RegisterLanguageInvocationHandler(m_XBPython.get(), ".py");
Expand Down Expand Up @@ -152,9 +153,10 @@ bool CServiceManager::Init3()
void CServiceManager::Deinit()
{
m_serviceAddons.reset();
m_gameServices->Deinit();
m_peripherals.reset();

//m_inputManager->Deinitialize(); //! @todo
m_gameServices->Deinit();

m_contextMenuManager.reset();
m_favouritesService.reset();
m_binaryAddonCache.reset();
Expand All @@ -169,6 +171,11 @@ void CServiceManager::Deinit()
CScriptInvocationManager::GetInstance().UnregisterLanguageInvocationHandler(m_XBPython.get());
m_XBPython.reset();
#endif

m_inputManager.reset();
m_peripherals.reset();
m_gameServices.reset();

m_announcementManager.reset();
init_level = 0;
}
Expand Down