diff options
author | german77 <juangerman-13@hotmail.com> | 2022-04-02 08:02:31 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-04-07 20:18:03 +0200 |
commit | fa5277ecdb363f22f31ad4d0b981e12dde4eed0e (patch) | |
tree | f8614e39d71c50c363a618945232af2a3e017627 /src/core/hid/emulated_controller.h | |
parent | Merge pull request #8164 from liamwhite/jit-stub (diff) | |
download | yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar.gz yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar.bz2 yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar.lz yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar.xz yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar.zst yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.zip |
Diffstat (limited to 'src/core/hid/emulated_controller.h')
-rw-r--r-- | src/core/hid/emulated_controller.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index aa52f9572..1e224685d 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -400,7 +400,7 @@ private: */ void TriggerOnChange(ControllerTriggerType type, bool is_service_update); - NpadIdType npad_id_type; + const NpadIdType npad_id_type; NpadStyleIndex npad_type{NpadStyleIndex::None}; NpadStyleTag supported_style_tag{NpadStyleSet::All}; bool is_connected{false}; @@ -434,6 +434,7 @@ private: StickDevices tas_stick_devices; mutable std::mutex mutex; + mutable std::mutex callback_mutex; std::unordered_map<int, ControllerUpdateCallback> callback_list; int last_callback_key = 0; |