From 4176cc77e1c3627ceee7b849195f026efc1bf9ca Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 21 Jan 2020 18:52:58 -0600 Subject: InputCommon/ControllerInterface: Make devices mutex recursive so RemoveDevice can be used within UpdateInput. --- Source/Core/InputCommon/ControllerInterface/Device.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp') 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 DeviceContainer::FindDevice(const DeviceQualifier& devq) const { - std::lock_guard 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 DeviceContainer::FindDevice(const DeviceQualifier& devq) std::vector DeviceContainer::GetAllDeviceStrings() const { - std::lock_guard lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); std::vector device_strings; DeviceQualifier device_qualifier; @@ -208,7 +208,7 @@ std::vector DeviceContainer::GetAllDeviceStrings() const std::string DeviceContainer::GetDefaultDeviceString() const { - std::lock_guard 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 lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); for (const auto& d : m_devices) { Device::Input* const i = d->FindInput(name); -- cgit v1.2.3