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.cpp | |
| parent | 5af2081c756b6584236044acb198374b2e8b1422 (diff) | |
InputCommon/ControllerInterface: Make devices mutex recursive so RemoveDevice can be used within UpdateInput.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index d91a9e119e..15c403ca24 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -180,7 +180,7 @@ bool DeviceQualifier::operator!=(const DeviceQualifier& devq) const std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) const { - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); for (const auto& d : m_devices) { if (devq == d.get()) @@ -192,7 +192,7 @@ std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) std::vector<std::string> DeviceContainer::GetAllDeviceStrings() const { - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); std::vector<std::string> device_strings; DeviceQualifier device_qualifier; @@ -208,7 +208,7 @@ std::vector<std::string> DeviceContainer::GetAllDeviceStrings() const std::string DeviceContainer::GetDefaultDeviceString() const { - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); if (m_devices.empty()) return ""; @@ -226,7 +226,7 @@ Device::Input* DeviceContainer::FindInput(std::string_view name, const Device* d return inp; } - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); for (const auto& d : m_devices) { Device::Input* const i = d->FindInput(name); |