commit 08a83ac2d452718918184031cb2be65ab9777064
author Philipp Wiesemann <philipp.wiesemann@arcor.de> Thu Aug 25 22:31:33 2016 +0200
committer Philipp Wiesemann <philipp.wiesemann@arcor.de> Thu Aug 25 22:31:33 2016 +0200
tree 9d5b5f55524cc8178d1f553d55dd5d102f2b2d24
parent defecec9b7cf60d5827488385bb76b7185fd2dd8

Android: Fixed crash if closing removed joystick (thanks, Sylvain!).

Fixes fix for Bugzilla #3408.

src/joystick/android/SDL_sysjoystick.c

diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c
index 89b8163..4225099 100644
--- a/src/joystick/android/SDL_sysjoystick.c
+++ b/src/joystick/android/SDL_sysjoystick.c
@@ -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 */