Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-10-27 00:49:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups in the joystick code.

Browse Source 
Removed some redundant state and other confusions.

Fixes Bugzilla #2738.
This commit is contained in:
Ryan C. Gordon
2015-03-24 13:52:01 -04:00
parent edbc673ec8
commit 44708540f3
15 changed files with 24 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/joystick/android/SDL_sysjoystick.c
View File

@@ -498,7 +498,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
/* Function to determine is this joystick is attached to the system right now */
SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
{
return !joystick->closed && (joystick->hwdata != NULL);
return joystick->hwdata != NULL;
}
void
@@ -529,11 +529,6 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
void
SDL_SYS_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->hwdata) {
((SDL_joylist_item*)joystick->hwdata)->joystick = NULL;
joystick->hwdata = NULL;
}
joystick->closed = 1;
}
/* Function to perform any system-specific joystick related cleanup */