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.

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

Fix crash on startup #12426

Merged
merged 1 commit into from Jul 5, 2017
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion xbmc/Application.cpp
Expand Up @@ -252,6 +252,7 @@ CApplication::CApplication(void)
, m_iScreenSaveLock(0)
, m_bPlaybackStarting(false)
, m_ePlayState(PLAY_STATE_NONE)
, m_ServiceManager(new CServiceManager)
, m_confirmSkinChange(true)
, m_ignoreSkinSettingChanges(false)
, m_saveSkinOnUnloading(true)
Expand Down Expand Up @@ -417,7 +418,6 @@ bool CApplication::Create()
// Grab a handle to our thread to be used later in identifying the render thread.
m_threadID = CThread::GetCurrentThreadId();

m_ServiceManager.reset(new CServiceManager());
if (!m_ServiceManager->Init1())
{
return false;
Expand Down