diff options
| author |  Viktor Szépe | 2024-01-16 00:09:00 +0000 |
|---|---|---|
| committer | Viktor Szépe | 2024-01-16 00:09:00 +0000 |
| commit | 90ab89a0b0174f8df559b79dc06a03479d959f93 (patch) | |
| tree | 3d11a790e44945e309f0e68f5332b33b42e72bbb /src/core/frontend/applets/controller.cpp | |
| parent | Fix typos in arrays.xml (diff) | |
| parent | Merge pull request #12681 from t895/stick-toggles (diff) | |
| download | yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.tar.gz yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.tar.xz yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.zip | |
Merge remote-tracking branch 'origin/master' into typos3
Diffstat (limited to 'src/core/frontend/applets/controller.cpp')
| -rw-r--r-- | src/core/frontend/applets/controller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index 34fe23b6a..e04d884ba 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp | |||
| @@ -47,7 +47,7 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac | |||
| 47 | // Connect controllers based on the following priority list from highest to lowest priority: | 47 | // Connect controllers based on the following priority list from highest to lowest priority: |
| 48 | // Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld | 48 | // Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld |
| 49 | if (parameters.allow_pro_controller) { | 49 | if (parameters.allow_pro_controller) { |
| 50 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); | 50 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey); |
| 51 | controller->Connect(true); | 51 | controller->Connect(true); |
| 52 | } else if (parameters.allow_dual_joycons) { | 52 | } else if (parameters.allow_dual_joycons) { |
| 53 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconDual); | 53 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconDual); |