From b84c4218651547f56285bb5f38006aeb027aee87 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 19 Apr 2015 03:43:00 -0700 Subject: [PATCH] SDL: Ensure switching gamepad uses haptic from the right gamepad --- src/platform/sdl/sdl-events.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 142207e4d..0e6b7b5c2 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -223,6 +223,9 @@ void GBASDLPlayerChangeJoystick(struct GBASDLEvents* events, struct GBASDLPlayer events->joysticksClaimed[player->playerId] = index; player->joystickIndex = index; player->joystick = events->joysticks[index]; +#if SDL_VERSION_ATLEAST(2, 0, 0) + player->haptic = events->haptic[index]; +#endif } static void _pauseAfterFrame(struct GBAThread* context) {