ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-06-22 21:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't probe for PlayStation controllers when we already know the controller type

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/7556

(cherry picked from commit 655a07bdd88d6bd19fe97c3abd39a2e2eef252ec)
This commit is contained in:
Sam Lantinga 2023-03-30 07:36:40 -07:00
parent f444eac557
commit 22685556e5
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/joystick/hidapi/SDL_hidapijoystick.c
View file

@ -140,6 +140,13 @@ void HIDAPI_DumpPacket(const char *prefix, const Uint8 *data, int size)
SDL_bool HIDAPI_SupportsPlaystationDetection(Uint16 vendor, Uint16 product) SDL_bool HIDAPI_SupportsPlaystationDetection(Uint16 vendor, Uint16 product)
{ {
/* If we already know the controller is a different type, don't try to detect it.
* This fixes a hang with the HORIPAD for Nintendo Switch (0x0f0d/0x00c1)
*/
if (SDL_GetGamepadTypeFromVIDPID(vendor, product, NULL, SDL_FALSE) != SDL_GAMEPAD_TYPE_UNKNOWN) {
return SDL_FALSE;
}
switch (vendor) { switch (vendor) {
case USB_VENDOR_DRAGONRISE: case USB_VENDOR_DRAGONRISE:
return SDL_TRUE; return SDL_TRUE;