encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Emscripten: Fixed sending SDL_JOYDEVICEADDED events with an index out of range. 

SDL_JOYDEVICEADDED events must contain the device index which is a value between
0 and the number of connected joysticks. The old implementation included a value
based on the instance id instead. It worked in some cases because the values are
similar initially. But after disconnecting joysticks this is no more the case
and the always increasing instance id becomes larger than number of joysticks.
This commit is contained in:
Philipp Wiesemann 2015-02-14 15:22:04 +01:00
parent 3941848838
commit 2ef8b1a76f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/emscripten/SDL_sysjoystick.c
View File

@ -112,7 +112,7 @@ Emscripten_JoyStickConnected(int eventType, const EmscriptenGamepadEvent *gamepa
event.type = SDL_JOYDEVICEADDED; event.type = SDL_JOYDEVICEADDED;
if (SDL_GetEventState(event.type) == SDL_ENABLE) { if (SDL_GetEventState(event.type) == SDL_ENABLE) {
event.jdevice.which = item->device_instance - 1; event.jdevice.which = item->index;
if ( (SDL_EventOK == NULL) || if ( (SDL_EventOK == NULL) ||
(*SDL_EventOK) (SDL_EventOKParam, &event) ) { (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
SDL_PushEvent(&event); SDL_PushEvent(&event);