diff options
| author | german77 <juangerman-13@hotmail.com> | 2023-01-09 04:37:13 +0100 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-01-20 01:05:22 +0100 |
| commit | b40aefb39ea8b4259acdbe0616790c2234d9b9ef (patch) | |
| tree | 00f11d49e134a345c93ef8e4d31b03198282c516 /src/input_common/drivers/sdl_driver.cpp | |
| parent | input_common: Fix issue where ring and irs are enabled at the same time (diff) | |
| download | yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.tar yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.tar.gz yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.tar.bz2 yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.tar.lz yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.tar.xz yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.tar.zst yuzu-b40aefb39ea8b4259acdbe0616790c2234d9b9ef.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 51a9d8962..e915ec090 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -319,7 +319,8 @@ void SDLDriver::InitJoystick(int joystick_index) { const auto guid = GetGUID(sdl_joystick); if (Settings::values.enable_joycon_driver) { - if (guid.uuid[5] == 0x05 && guid.uuid[4] == 0x7e) { + if (guid.uuid[5] == 0x05 && guid.uuid[4] == 0x7e && + (guid.uuid[8] == 0x06 || guid.uuid[8] == 0x07)) { LOG_ERROR(Input, "Device black listed {}", joystick_index); SDL_JoystickClose(sdl_joystick); return; @@ -451,11 +452,10 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en // Disable hidapi drivers for switch controllers when the custom joycon driver is enabled if (Settings::values.enable_joycon_driver) { SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "0"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "0"); } else { SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1"); - SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1"); } + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "1"); // Disable hidapi driver for xbox. Already default on Windows, this causes conflict with native // driver on Linux. |