diff options
| author | 2022-12-20 12:45:54 -0600 | |
|---|---|---|
| committer | 2023-01-19 18:05:20 -0600 | |
| commit | 2d802893e706c4ce7fd6f320db0eed2bf90b2d45 (patch) | |
| tree | 32368e503159fc82cd7362ef37eec94b9a5b3bbe /src/input_common/drivers/joycon.cpp | |
| parent | input_common: Initial skeleton for custom joycon driver (diff) | |
| download | yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.gz yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.xz yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.zip | |
input_common: Disable SDL driver with switch controllers
Diffstat (limited to 'src/input_common/drivers/joycon.cpp')
| -rw-r--r-- | src/input_common/drivers/joycon.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index eab10d11c..1fca11d34 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp | |||
| @@ -13,6 +13,10 @@ | |||
| 13 | namespace InputCommon { | 13 | namespace InputCommon { |
| 14 | 14 | ||
| 15 | Joycons::Joycons(const std::string& input_engine_) : InputEngine(input_engine_) { | 15 | Joycons::Joycons(const std::string& input_engine_) : InputEngine(input_engine_) { |
| 16 | // Avoid conflicting with SDL driver | ||
| 17 | if (!Settings::values.enable_joycon_driver) { | ||
| 18 | return; | ||
| 19 | } | ||
| 16 | LOG_INFO(Input, "Joycon driver Initialization started"); | 20 | LOG_INFO(Input, "Joycon driver Initialization started"); |
| 17 | const int init_res = SDL_hid_init(); | 21 | const int init_res = SDL_hid_init(); |
| 18 | if (init_res == 0) { | 22 | if (init_res == 0) { |