Make sure we don't create a game controller mapping for HID devices that aren't supported by HIDAPI
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 593c70f..8c02cc4 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -446,8 +446,14 @@
const Uint16 USAGE_MULTIAXISCONTROLLER = 0x0008;
int i;
SDL_GameControllerType type;
+ SDL_JoystickGUID check_guid;
- if (SDL_ShouldIgnoreJoystick(device->name, device->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)) {
return NULL;
}
