Skip to content

Commit 712c76f

Browse files
committed
gamepad: Fix inability to disable SDL_EVENT_GAMEPAD_UPDATE_COMPLETE events
1 parent 418acf6 commit 712c76f

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

src/joystick/SDL_gamepad.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -405,15 +405,17 @@ static bool SDLCALL SDL_GamepadEventWatcher(void *userdata, SDL_Event *event)
405405
{
406406
SDL_AssertJoysticksLocked();
407407

408-
for (gamepad = SDL_gamepads; gamepad; gamepad = gamepad->next) {
409-
if (gamepad->joystick->instance_id == event->jdevice.which) {
410-
SDL_Event deviceevent;
411-
412-
deviceevent.type = SDL_EVENT_GAMEPAD_UPDATE_COMPLETE;
413-
deviceevent.common.timestamp = event->jdevice.timestamp;
414-
deviceevent.gdevice.which = event->jdevice.which;
415-
SDL_PushEvent(&deviceevent);
416-
break;
408+
if (SDL_EventEnabled(SDL_EVENT_GAMEPAD_UPDATE_COMPLETE)) {
409+
for (gamepad = SDL_gamepads; gamepad; gamepad = gamepad->next) {
410+
if (gamepad->joystick->instance_id == event->jdevice.which) {
411+
SDL_Event deviceevent;
412+
413+
deviceevent.type = SDL_EVENT_GAMEPAD_UPDATE_COMPLETE;
414+
deviceevent.common.timestamp = event->jdevice.timestamp;
415+
deviceevent.gdevice.which = event->jdevice.which;
416+
SDL_PushEvent(&deviceevent);
417+
break;
418+
}
417419
}
418420
}
419421
} break;

0 commit comments

Comments
 (0)