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

Make sure the joystick count is correct when the added and removed events are dispatched, in case someone is watching for them with an event filter.

This commit is contained in:
Sam Lantinga 2013-11-08 14:04:59 -08:00
parent 621c7f8f1f
commit e3e24bded7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/linux/SDL_sysjoystick.c
View File

@ -234,12 +234,15 @@ MaybeAddDevice(const char *path)
SDL_joylist_tail = item; SDL_joylist_tail = item;
} }
/* Need to increment the joystick count before we post the event */
++numjoysticks;
/* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */ /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */
#if !SDL_EVENTS_DISABLED #if !SDL_EVENTS_DISABLED
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 = numjoysticks; event.jdevice.which = (numjoysticks - 1);
if ( (SDL_EventOK == NULL) || if ( (SDL_EventOK == NULL) ||
(*SDL_EventOK) (SDL_EventOKParam, &event) ) { (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
SDL_PushEvent(&event); SDL_PushEvent(&event);
@ -247,7 +250,7 @@ MaybeAddDevice(const char *path)
} }
#endif /* !SDL_EVENTS_DISABLED */ #endif /* !SDL_EVENTS_DISABLED */
return numjoysticks++; return numjoysticks;
} }
#if SDL_USE_LIBUDEV #if SDL_USE_LIBUDEV
@ -282,6 +285,9 @@ MaybeRemoveDevice(const char *path)
SDL_joylist_tail = prev; SDL_joylist_tail = prev;
} }
/* Need to decrement the joystick count before we post the event */
--numjoysticks;
/* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */ /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */
#if !SDL_EVENTS_DISABLED #if !SDL_EVENTS_DISABLED
event.type = SDL_JOYDEVICEREMOVED; event.type = SDL_JOYDEVICEREMOVED;
@ -298,7 +304,6 @@ MaybeRemoveDevice(const char *path)
SDL_free(item->path); SDL_free(item->path);
SDL_free(item->name); SDL_free(item->name);
SDL_free(item); SDL_free(item);
numjoysticks--;
return retval; return retval;
} }
prev = item; prev = item;