Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 17:45:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed an issue where ES could crash when a controller was unplugged.

Browse source
This commit is contained in:
Leon Styhre 2020-08-24 18:59:04 +02:00
parent c9831a6aee
commit 1df4caa43b
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
es-core/src/InputManager.cpp
View file

@ -224,6 +224,11 @@ bool InputManager::parseEvent(const SDL_Event& ev, Window* window)
switch (ev.type) { switch (ev.type) {
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:
// This should hopefully prevent a potential crash if the controller was unplugged
// while a game was running.
if (!mInputConfigs[ev.jaxis.which])
return false;
axisValue = ev.jaxis.value; axisValue = ev.jaxis.value;
// For the analog trigger buttons, convert the negative<->positive axis values to only // For the analog trigger buttons, convert the negative<->positive axis values to only
// positive values in order to avoid registering double inputs. This is only a // positive values in order to avoid registering double inputs. This is only a
@ -259,11 +264,17 @@ bool InputManager::parseEvent(const SDL_Event& ev, Window* window)
case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP: case SDL_JOYBUTTONUP:
if (!mInputConfigs[ev.jaxis.which])
return false;
window->input(getInputConfigByDevice(ev.jbutton.which), Input(ev.jbutton.which, window->input(getInputConfigByDevice(ev.jbutton.which), Input(ev.jbutton.which,
TYPE_BUTTON, ev.jbutton.button, ev.jbutton.state == SDL_PRESSED, false)); TYPE_BUTTON, ev.jbutton.button, ev.jbutton.state == SDL_PRESSED, false));
return true; return true;
case SDL_JOYHATMOTION: case SDL_JOYHATMOTION:
if (!mInputConfigs[ev.jaxis.which])
return false;
window->input(getInputConfigByDevice(ev.jhat.which), Input(ev.jhat.which, window->input(getInputConfigByDevice(ev.jhat.which), Input(ev.jhat.which,
TYPE_HAT, ev.jhat.hat, ev.jhat.value, false)); TYPE_HAT, ev.jhat.hat, ev.jhat.value, false));
return true; return true;