ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent potential NULL pointer access.

Browse Source
This commit is contained in:
hiker 2015-01-08 08:15:58 +11:00
parent d070474445
commit 474012c442
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/states_screens/options_screen_input2.cpp
View File

@ -431,10 +431,10 @@ void OptionsScreenInput2::gotSensedInput(const Input& sensed_input)
} }
} }
GamePadDevice *gpad = input_manager->getDeviceManager()
->getGamePadFromIrrID(sensed_input.m_device_id);
std::string gamepad_name = input_manager->getDeviceManager() std::string gamepad_name = gpad ? gpad->getName() : "UNKNOWN DEVICE";
->getGamePadFromIrrID(sensed_input.m_device_id)
->getName();
if (m_config->getName() == gamepad_name) if (m_config->getName() == gamepad_name)
{ {
GamepadConfig* config = (GamepadConfig*)m_config; GamepadConfig* config = (GamepadConfig*)m_config;