Fixed HIDAPI PS4 controller being picked up when running under Steam Input with PS4 configuration enabled
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 387777f..5288c55 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -2562,8 +2562,7 @@ SDL_bool SDL_ShouldIgnoreJoystick(const char *name, SDL_JoystickGUID guid)
return SDL_TRUE;
}
- if (SDL_IsGameControllerNameAndGUID(name, guid) &&
- SDL_ShouldIgnoreGameController(name, guid)) {
+ if (SDL_ShouldIgnoreGameController(name, guid)) {
return SDL_TRUE;
}
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 34542f9..a72e6a2 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -134,14 +134,8 @@ HIDAPI_GetDeviceDriver(SDL_HIDAPI_Device *device)
const Uint16 USAGE_MULTIAXISCONTROLLER = 0x0008;
int i;
SDL_GameControllerType type;
- SDL_JoystickGUID check_guid;
- /* Make sure we have a generic GUID here, otherwise if we pass a HIDAPI
- 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)) {
+ if (SDL_ShouldIgnoreJoystick(device->name, device->guid)) {
return NULL;
}