diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2020-02-22 17:20:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 17:20:44 +0100 |
| commit | 2b6a1ee4d87a80418ade913e15745d78309f7f67 (patch) | |
| tree | 5989875b0c893ae1ae843a2ef6f1bad3969e39f3 /Source/Core/InputCommon/ControllerInterface/Device.h | |
| parent | f3c89fd6c2e190b41e7cf3a731b1a303b78f359a (diff) | |
| parent | 70ac9ad2e6faf120c8ef4859141675c33e5f33c7 (diff) | |
Merge pull request #8575 from jordan-woyak/ciface-wiimotes
InputCommon: Add support for Wii Remotes in ControllerInterface
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index e07f4fb16a..39ff6e9bb5 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -198,7 +198,7 @@ public: DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings) const; protected: - mutable std::mutex m_devices_mutex; + mutable std::recursive_mutex m_devices_mutex; std::vector<std::shared_ptr<Device>> m_devices; }; } // namespace Core |