diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2022-12-20 19:45:54 +0100 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-01-20 01:05:20 +0100 |
| 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 yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.gz yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.bz2 yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.lz yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.xz yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.tar.zst yuzu-2d802893e706c4ce7fd6f320db0eed2bf90b2d45.zip | |
Diffstat (limited to '')
| -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 @@ namespace InputCommon { Joycons::Joycons(const std::string& input_engine_) : InputEngine(input_engine_) { + // Avoid conflicting with SDL driver + if (!Settings::values.enable_joycon_driver) { + return; + } LOG_INFO(Input, "Joycon driver Initialization started"); const int init_res = SDL_hid_init(); if (init_res == 0) { |