Android: Restored Philipp's joystick change, lost in the previous merge.
This patch, specifically: https://hg.libsdl.org/SDL/rev/2455bf5d1866
--- a/src/joystick/android/SDL_sysjoystick.c Fri Feb 19 00:24:00 2016 -0500
+++ b/src/joystick/android/SDL_sysjoystick.c Fri Feb 19 00:28:53 2016 -0500
@@ -323,7 +323,6 @@
{
SDL_joylist_item *item = SDL_joylist;
SDL_joylist_item *prev = NULL;
- int retval;
#if !SDL_EVENTS_DISABLED
SDL_Event event;
#endif
@@ -341,7 +340,6 @@
return -1;
}
- retval = item->device_instance;
if (item->joystick) {
item->joystick->hwdata = NULL;
}