aboutsummaryrefslogtreecommitdiff
path: root/src/input_common/drivers/sdl_driver.cpp
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2021-12-14 10:12:17 -0600
committerGitHub <noreply@github.com>2021-12-14 10:12:17 -0600
commita980d24a542b68e4fa54b386298ace57792261f1 (patch)
tree087a8b1cb7131302075d87b8155e0e070d16ca90 /src/input_common/drivers/sdl_driver.cpp
parent5c78fc44c171bf2f685a447c502ff73a21e177ce (diff)
parentaf37388ee5304f7efa75799ea00dd509f24e1b3a (diff)
Merge pull request #7577 from v1993/patch-2
input/SDL: Update SDL hints
Diffstat (limited to 'src/input_common/drivers/sdl_driver.cpp')
-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 e33a5ff31f..0cda9df62b 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -403,10 +403,11 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
// 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;