diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2020-01-21 18:52:58 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2020-02-17 15:58:06 -0600 |
| commit | 4176cc77e1c3627ceee7b849195f026efc1bf9ca (patch) | |
| tree | 7b22972a98827e12357eab76c896fad5c7817b04 /Source/Core/InputCommon/ControllerInterface/Device.h | |
| parent | 5af2081c756b6584236044acb198374b2e8b1422 (diff) | |
InputCommon/ControllerInterface: Make devices mutex recursive so RemoveDevice can be used within UpdateInput.
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 |