geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed HIDAPI PS4 controller being picked up when running under Steam 

Input with PS4 configuration enabled
main
Sam Lantinga 2022-05-19 16:49:47 -07:00
parent 83ae1b4987
commit b1cf322971
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/joystick/SDL_joystick.c
View File

@ -2562,8 +2562,7 @@ SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid)
return SDL_TRUE; return SDL_TRUE;
} }
if (SDL_IsGameControllerNameAndGUID(name, guid) && if (SDL_ShouldIgnoreGameController(name, guid)) {
SDL_ShouldIgnoreGameController(name, guid)) {
return SDL_TRUE; return SDL_TRUE;
} }

8
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -134,14 +134,8 @@ HIDAPI_GetDeviceDriver(SDL_HIDAPI_Device *device)
const Uint16 USAGE_MULTIAXISCONTROLLER = 0x0008; const Uint16 USAGE_MULTIAXISCONTROLLER = 0x0008;
int i; int i;
SDL_GameControllerType type; SDL_GameControllerType type;
SDL_JoystickGUID check_guid;
/* Make sure we have a generic GUID here, otherwise if we pass a HIDAPI if (SDL_ShouldIgnoreJoystick(device->name, device->guid)) {
guid, this call will create a game controller mapping for the device.
*/
check_guid = device->guid;
check_guid.data[14] = 0;
if (SDL_ShouldIgnoreJoystick(device->name, check_guid)) {
return NULL; return NULL;
} }