Mercurial Mercurial > icculus > SDL-audio-capture / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Android: Fixed crash if closing removed joystick (thanks, Sylvain!).
authorPhilipp Wiesemann <philipp.wiesemann@arcor.de>
Thu, 25 Aug 2016 22:31:33 +0200
changeset 10278 74c39dbe8d30
parent 10277 29d7289e9055
child 10279 d1c27f616999
Android: Fixed crash if closing removed joystick (thanks, Sylvain!). Fixes fix for Bugzilla #3408.
src/joystick/android/SDL_sysjoystick.c file | annotate | diff | comparison | revisions 
--- 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 */
icculus/SDL-audio-capture