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

Fix crash on startup #12426

merged 1 commit into from Jul 5, 2017

Conversation

garbear
Copy link
Member

@garbear garbear commented Jul 5, 2017

This fixes a crash on startup introduced in commit 26349e1, "Move CInputManager into service manager" from #12366.

Specifically, CAppParamParser references CInputManager which is owned by CServiceManager, which hasn't been created or initialized yet.

To fix this, we create CServiceManager before the input manager is accessed. This causes the IR remote commands to be performed on an uninitialized CInputManager, which is perfectly acceptable as these parameters are meant to be set before initialization.

This fixes a crash on startup introduced in commit 26349e1, "Move
CInputManager into service manager" from PR 12366.
@garbear garbear added Type: Fix non-breaking change which fixes an issue v18 Leia labels Jul 5, 2017
@garbear garbear added this to the L 18.0-alpha1 milestone Jul 5, 2017
@garbear
Copy link
Member Author

garbear commented Jul 5, 2017

jenkins build this please

@garbear
Copy link
Member Author

garbear commented Jul 5, 2017

Confirmed working in slack

@garbear garbear merged commit 5373dc2 into xbmc:master Jul 5, 2017
@garbear garbear mentioned this pull request Jul 5, 2017
3 tasks
@garbear garbear deleted the fix-startup-crash branch July 5, 2017 18:51
@garbear
Copy link
Member Author

garbear commented Jul 6, 2017

Reverted and fixed properly in #12432

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant