VERY experimental Nintendo Switch 2 emulator
C++
Fixes second controller not detected in DKTF and possibly other games
Maran Br8f5a65bdb09b
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cppindex 9aa08d5cc9..5bdad4a0ad 100644--- a/src/hid_core/frontend/emulated_controller.cpp+++ b/src/hid_core/frontend/emulated_controller.cpp@@ -760,11 +760,14 @@ void EmulatedController::StartMotionCalibration() {}}-void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index,- Common::UUID uuid) {- if (index >= controller.button_values.size()) {+void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index, Common::UUID uuid) {+ const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);+ const auto& player = Settings::values.players.GetValue()[player_index];++ if (index >= controller.button_values.size()) {return;}+std::unique_lock lock{mutex};bool value_changed = false;const auto new_status = TransformToButton(callback);@@ -917,13 +920,8 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callbacklock.unlock();- if (!is_connected) {- if (npad_id_type == NpadIdType::Player1 && npad_type != NpadStyleIndex::Handheld) {- Connect();- }- if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) {- Connect();- }+ if (player.connected) {+ Connect();}TriggerOnChange(ControllerTriggerType::Button, true);}