diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-21 23:47:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 23:47:10 -0800 |
| commit | 29ccc7673fc10dee39880fd7bad0ff264765dd56 (patch) | |
| tree | 234c2a3fca543e580480ed72e37c1ee9f201aa93 /src/core/hle/service/hid/controllers/npad.h | |
| parent | 1279c7ce7afd3d1bf2b4e33aa922158acf2cd060 (diff) | |
| parent | 82fa9f8d56bc285e7bb58fc81b495a55be9ea82c (diff) | |
Merge pull request #5042 from Morph1984/project-aether
Project Aether: Reimplementation of the Web Browser Applet
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 9fac00231..e2e826623 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -5,6 +5,7 @@ #pragma once #include <array> +#include <atomic> #include "common/bit_field.h" #include "common/common_types.h" #include "core/frontend/input.h" @@ -415,7 +416,7 @@ private: bool IsControllerSupported(NPadControllerType controller) const; void RequestPadStateUpdate(u32 npad_id); - u32 press_state{}; + std::atomic<u32> press_state{}; NpadStyleSet style{}; std::array<NPadEntry, 10> shared_memory_entries{}; |