diff options
author | bunnei <bunneidev@gmail.com> | 2021-12-31 01:54:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-31 01:54:35 +0100 |
commit | 667a8ae163681f68d90010bc7dd05eb7398524d6 (patch) | |
tree | dea803db312fc0e36c5ed2c9000cacf3bd4df7c3 /src/core/frontend/applets/controller.cpp | |
parent | Merge pull request #7635 from bunnei/set-heap-size (diff) | |
parent | core/hid: Fix controller type validation (diff) | |
download | yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.tar yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.tar.gz yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.tar.bz2 yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.tar.lz yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.tar.xz yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.tar.zst yuzu-667a8ae163681f68d90010bc7dd05eb7398524d6.zip |
Diffstat (limited to 'src/core/frontend/applets/controller.cpp')
-rw-r--r-- | src/core/frontend/applets/controller.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index 6dbd38ffa..e1033b634 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp @@ -45,26 +45,26 @@ void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callb // Pro Controller -> Dual Joycons -> Left Joycon/Right Joycon -> Handheld if (parameters.allow_pro_controller) { controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); - controller->Connect(); + controller->Connect(true); } else if (parameters.allow_dual_joycons) { controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconDual); - controller->Connect(); + controller->Connect(true); } else if (parameters.allow_left_joycon && parameters.allow_right_joycon) { // Assign left joycons to even player indices and right joycons to odd player indices. // We do this since Captain Toad Treasure Tracker expects a left joycon for Player 1 and // a right Joycon for Player 2 in 2 Player Assist mode. if (index % 2 == 0) { controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconLeft); - controller->Connect(); + controller->Connect(true); } else { controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::JoyconRight); - controller->Connect(); + controller->Connect(true); } } else if (index == 0 && parameters.enable_single_mode && parameters.allow_handheld && !Settings::values.use_docked_mode.GetValue()) { // We should *never* reach here under any normal circumstances. controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); - controller->Connect(); + controller->Connect(true); } else { UNREACHABLE_MSG("Unable to add a new controller based on the given parameters!"); } |