Android: Changed an internal joystick function to return count instead of id.
The returned value is currently not used by the caller. The instance id would also not be needed on Java side and providing it just complicated the function. Partially fixes Bugzilla #3234.
parent
0e2badc144
commit
9cd9925cc9
|
@ -340,7 +340,6 @@ Android_RemoveJoystick(int device_id)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
const int retval = item->device_instance;
|
|
||||||
if (item->joystick) {
|
if (item->joystick) {
|
||||||
item->joystick->hwdata = NULL;
|
item->joystick->hwdata = NULL;
|
||||||
}
|
}
|
||||||
|
@ -376,7 +375,7 @@ Android_RemoveJoystick(int device_id)
|
||||||
|
|
||||||
SDL_free(item->name);
|
SDL_free(item->name);
|
||||||
SDL_free(item);
|
SDL_free(item);
|
||||||
return retval;
|
return numjoysticks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue