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 when peripheral.joystick is disabled #12951

Merged
merged 1 commit into from Oct 25, 2017

Conversation

@garbear
Copy link
Member

garbear commented Oct 23, 2017

Fixes a segfault reported here.

How Has This Been Tested?

Untested. I'll have time to test after DevCon.

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
When peripheral.joystick is disabled, Kodi fails to load button maps for
the controller and CPeripheralJoystick::m_joystickMonitor is not
initialized. Attempting to unregister the null pointer causes a segfault.
@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Oct 24, 2017

This also got into 17.5?

@garbear

This comment has been minimized.

Copy link
Member Author

garbear commented Oct 25, 2017

Confirmed fixed on Shield TV

@garbear garbear merged commit 2f0fd5c into xbmc:master Oct 25, 2017
1 check passed
1 check passed
default You're awesome. Have a cookie
Details
@garbear garbear deleted the garbear:fix-startup branch Oct 25, 2017
@Rechi Rechi added this to the L 18.0-alpha1 milestone Oct 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.