From d3daba791aafa9a10db5b948fc33e62f75dff7e4 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 6 Jan 2024 08:29:01 -0800 Subject: [PATCH] Don't try to send the PS third-party feature request to the Logitech G815 keyboard Fixes https://github.com/libsdl-org/SDL/issues/8373 --- src/joystick/hidapi/SDL_hidapijoystick.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c index a3c6872b0..bb1f9376f 100644 --- a/src/joystick/hidapi/SDL_hidapijoystick.c +++ b/src/joystick/hidapi/SDL_hidapijoystick.c @@ -152,8 +152,13 @@ SDL_bool HIDAPI_SupportsPlaystationDetection(Uint16 vendor, Uint16 product) case USB_VENDOR_HORI: return SDL_TRUE; case USB_VENDOR_LOGITECH: - /* Most Logitech devices are fine with this, but the F310 will lock up */ + /* Most Logitech devices are fine with this, but there are a few exceptions */ if (product == USB_PRODUCT_LOGITECH_F310) { + /* The Logitech F310 gamepad will lock up */ + return SDL_FALSE; + } + if (product == 0xc33f) { + /* The Logitech G815 keyboard will reset the LEDs */ return SDL_FALSE; } return SDL_TRUE;