diff options
| author | 2022-04-02 00:02:31 -0600 | |
|---|---|---|
| committer | 2022-04-07 13:18:03 -0500 | |
| 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.gz yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.tar.xz yuzu-fa5277ecdb363f22f31ad4d0b981e12dde4eed0e.zip | |
core: hid: Reduce the amount of dataraces
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: | |||
| 400 | */ | 400 | */ |
| 401 | void TriggerOnChange(ControllerTriggerType type, bool is_service_update); | 401 | void TriggerOnChange(ControllerTriggerType type, bool is_service_update); |
| 402 | 402 | ||
| 403 | NpadIdType npad_id_type; | 403 | const NpadIdType npad_id_type; |
| 404 | NpadStyleIndex npad_type{NpadStyleIndex::None}; | 404 | NpadStyleIndex npad_type{NpadStyleIndex::None}; |
| 405 | NpadStyleTag supported_style_tag{NpadStyleSet::All}; | 405 | NpadStyleTag supported_style_tag{NpadStyleSet::All}; |
| 406 | bool is_connected{false}; | 406 | bool is_connected{false}; |
| @@ -434,6 +434,7 @@ private: | |||
| 434 | StickDevices tas_stick_devices; | 434 | StickDevices tas_stick_devices; |
| 435 | 435 | ||
| 436 | mutable std::mutex mutex; | 436 | mutable std::mutex mutex; |
| 437 | mutable std::mutex callback_mutex; | ||
| 437 | std::unordered_map<int, ControllerUpdateCallback> callback_list; | 438 | std::unordered_map<int, ControllerUpdateCallback> callback_list; |
| 438 | int last_callback_key = 0; | 439 | int last_callback_key = 0; |
| 439 | 440 | ||