From bb836ed6c28d608b3cf9da4116bb6f9a2fb6f273 Mon Sep 17 00:00:00 2001 From: MaranBr Date: Thu, 16 Oct 2025 03:14:39 +0200 Subject: [hid_core] Fix a crash related to setting controls while the game is running (#2747) This fixes a crash related to setting controls while the game is running. Fixes BOTW, TOTK, MK8D and possibly others as well. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2747 Reviewed-by: crueter Reviewed-by: Lizzie Co-authored-by: MaranBr Co-committed-by: MaranBr --- src/hid_core/frontend/emulated_controller.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/hid_core/frontend/emulated_controller.cpp') diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 0ddab89da3..6c1fc63821 100644 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -763,14 +763,11 @@ void EmulatedController::StartMotionCalibration() { } } -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]; - +void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index, + Common::UUID uuid) { if (index >= controller.button_values.size()) { return; } - std::unique_lock lock{mutex}; bool value_changed = false; const auto new_status = TransformToButton(callback); @@ -923,9 +920,12 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback lock.unlock(); - if (player.connected) { + const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type); + if (!is_connected && !controller_connected[player_index]) { Connect(); + controller_connected[player_index] = true; } + TriggerOnChange(ControllerTriggerType::Button, true); } -- cgit v1.2.3