summaryrefslogtreecommitdiffstats
path: root/src/input_common/drivers
diff options
context:
space:
mode:
authorValeri <v19930312@gmail.com>2021-12-13 21:23:34 +0100
committerv1993 <v19930312@gmail.com>2021-12-14 13:02:03 +0100
commit7f965172c5cd4f891e1f2025050cbf9492dbf5c8 (patch)
tree132da0cf6ae98a3265ebbac15aafc753af43625e /src/input_common/drivers
parentMerge pull request #7574 from v1993/patch-1 (diff)
downloadyuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.tar
yuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.tar.gz
yuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.tar.bz2
yuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.tar.lz
yuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.tar.xz
yuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.tar.zst
yuzu-7f965172c5cd4f891e1f2025050cbf9492dbf5c8.zip
Diffstat (limited to 'src/input_common/drivers')
-rw-r--r--src/input_common/drivers/sdl_driver.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 1052ed394..24fd3ab92 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -403,10 +403,11 @@ SDLDriver::SDLDriver(const std::string& input_engine_) : InputEngine(input_engin
// Use hidapi driver for joycons. This will allow joycons to be detected as a GameController and
// not a generic one
- SDL_SetHint("SDL_JOYSTICK_HIDAPI_JOY_CONS", "1");
+ SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1");
- // Turn off Pro controller home led
- SDL_SetHint("SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "0");
+ // Disable hidapi driver for xbox. Already default on Windows, this causes conflict with native
+ // driver on Linux.
+ SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_XBOX, "0");
// If the frontend is going to manage the event loop, then we don't start one here
start_thread = SDL_WasInit(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) == 0;