eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-21 12:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed creating an Android game controller mapping for HIDAPI devices on initialization

Browse source
This commit is contained in:
Sam Lantinga 2018-09-17 11:35:22 -07:00
parent 305e5968aa
commit 59a2d12cc3
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/joystick/SDL_gamecontroller.c
View file

@ -432,12 +432,12 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
pSupportedController = pSupportedController->next;
}
if (!exact_match) {
if (guid->data[14] == 'h') {
if (SDL_IsJoystickHIDAPI(*guid)) {
/* This is a HIDAPI device */
return s_pHIDAPIMapping;
}
#if SDL_JOYSTICK_XINPUT
if (guid->data[14] == 'x') {
if (SDL_IsJoystickXInput(*guid)) {
/* This is an XInput device */
return s_pXInputMapping;
}
@ -1026,8 +1026,8 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
}
}
#ifdef __ANDROID__
if (!mapping) {
mapping = SDL_CreateMappingForAndroidController(name, guid);
if (!mapping && name && !SDL_IsJoystickHIDAPI(guid)) {
mapping = SDL_CreateMappingForAndroidController(name, guid);
}
#endif
if (!mapping) {