# HG changeset patch # User Philipp Wiesemann # Date 1472157104 -7200 # Node ID d1c27f616999f2e73b391be064e6fa8489c95d52 # Parent 74c39dbe8d30e530f194aa82ee73525a21060ba2 Emscripten: Fixed crash if closing removed joystick (thanks, Sylvain!). diff -r 74c39dbe8d30 -r d1c27f616999 src/joystick/emscripten/SDL_sysjoystick.c --- a/src/joystick/emscripten/SDL_sysjoystick.c Thu Aug 25 22:31:33 2016 +0200 +++ b/src/joystick/emscripten/SDL_sysjoystick.c Thu Aug 25 22:31:44 2016 +0200 @@ -378,7 +378,9 @@ 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 */