From d7f530ddcf25b60e54ec26ec2a07ec20cd107291 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 20 Feb 2016 22:21:37 -0800
Subject: [PATCH] SDL: Fix potential joystick crash in games with rumble

---
 CHANGES                       | 1 +
 src/platform/sdl/sdl-events.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index dcb2c45dd..b4cef29dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ Bugfixes:
  - OpenGL: Correct boolean vector strcmp strings for uniforms
  - Wii: Fix tilting direction
  - SDL: Fix joystick initialization on BS
+ - SDL: Fix potential joystick crash in games with rumble
 Misc:
  - GBA: Slightly optimize GBAProcessEvents
  - Qt: Add preset for DualShock 4
diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c
index 22852ca09..ab8153936 100644
--- a/src/platform/sdl/sdl-events.c
+++ b/src/platform/sdl/sdl-events.c
@@ -593,7 +593,7 @@ void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLPlayer* sdlContex
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 static void _GBASDLSetRumble(struct GBARumble* rumble, int enable) {
 	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;
 	}
 	sdlRumble->level += enable;