From e79f00097a5f49eacb1d5ce19cddb00536fe25bc Mon Sep 17 00:00:00 2001 From: Philipp Wiesemann Date: Thu, 25 Aug 2016 22:31:44 +0200 Subject: [PATCH] Emscripten: Fixed crash if closing removed joystick (thanks, Sylvain!). --- src/joystick/emscripten/SDL_sysjoystick.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/joystick/emscripten/SDL_sysjoystick.c b/src/joystick/emscripten/SDL_sysjoystick.c index c3becd291..c3edf4967 100644 --- a/src/joystick/emscripten/SDL_sysjoystick.c +++ b/src/joystick/emscripten/SDL_sysjoystick.c @@ -378,7 +378,9 @@ void SDL_SYS_JoystickClose(SDL_Joystick * joystick) { SDL_joylist_item *item = (SDL_joylist_item *) joystick->hwdata; - item->joystick = NULL; + if (item) { + item->joystick = NULL; + } } /* Function to perform any system-specific joystick related cleanup */