# HG changeset patch # User Philipp Wiesemann # Date 1472157093 -7200 # Node ID 74c39dbe8d30e530f194aa82ee73525a21060ba2 # Parent 29d7289e90555bf3858eecbf823f541660cc29bf Android: Fixed crash if closing removed joystick (thanks, Sylvain!). Fixes fix for Bugzilla #3408. diff -r 29d7289e9055 -r 74c39dbe8d30 src/joystick/android/SDL_sysjoystick.c --- a/src/joystick/android/SDL_sysjoystick.c Sat Aug 20 13:46:45 2016 -0400 +++ b/src/joystick/android/SDL_sysjoystick.c Thu Aug 25 22:31:33 2016 +0200 @@ -539,7 +539,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 */