ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: Fix potential joystick crash in games with rumble

This commit is contained in:
Jeffrey Pfau 2016-02-20 22:21:37 -08:00
parent 9c73cf536a
commit d7f530ddcf
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -7,6 +7,7 @@ Bugfixes:
- OpenGL: Correct boolean vector strcmp strings for uniforms - OpenGL: Correct boolean vector strcmp strings for uniforms
- Wii: Fix tilting direction - Wii: Fix tilting direction
- SDL: Fix joystick initialization on BS - SDL: Fix joystick initialization on BS
- SDL: Fix potential joystick crash in games with rumble
Misc: Misc:
- GBA: Slightly optimize GBAProcessEvents - GBA: Slightly optimize GBAProcessEvents
- Qt: Add preset for DualShock 4 - Qt: Add preset for DualShock 4

2
src/platform/sdl/sdl-events.c
View File

@ -593,7 +593,7 @@ void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLPlayer* sdlContex
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
static void _GBASDLSetRumble(struct GBARumble* rumble, int enable) { static void _GBASDLSetRumble(struct GBARumble* rumble, int enable) {
struct GBASDLRumble* sdlRumble = (struct GBASDLRumble*) rumble; struct GBASDLRumble* sdlRumble = (struct GBASDLRumble*) rumble;
if (!sdlRumble->p->joystick->haptic || !SDL_HapticRumbleSupported(sdlRumble->p->joystick->haptic)) { if (!sdlRumble->p->joystick || !sdlRumble->p->joystick->haptic || !SDL_HapticRumbleSupported(sdlRumble->p->joystick->haptic)) {
return; return;
} }
sdlRumble->level += enable; sdlRumble->level += enable;