VERY experimental Nintendo Switch 2 emulator
C++
[hid_core] Fix a crash related to setting controls while the game is running (#2747)
MaranBrbb836ed6c28d
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cppindex 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& callbacklock.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);}diff --git a/src/hid_core/frontend/emulated_controller.h b/src/hid_core/frontend/emulated_controller.hindex 677b363157..8e8293ff36 100644--- a/src/hid_core/frontend/emulated_controller.h+++ b/src/hid_core/frontend/emulated_controller.h@@ -20,6 +20,7 @@#include "common/settings.h"#include "common/vector_math.h"#include "hid_core/frontend/motion_input.h"+#include "hid_core/hid_core.h"#include "hid_core/hid_types.h"#include "hid_core/irsensor/irs_types.h"@@ -588,6 +589,7 @@ private:std::array<VibrationValue, 2> last_vibration_value{DEFAULT_VIBRATION_VALUE,DEFAULT_VIBRATION_VALUE};std::array<std::chrono::steady_clock::time_point, 2> last_vibration_timepoint{};+ std::array<bool, HIDCore::available_controllers - 2> controller_connected{};// Temporary values to avoid doing changes while the controller is in configuring modeNpadStyleIndex tmp_npad_type{NpadStyleIndex::None};