From 4176cc77e1c3627ceee7b849195f026efc1bf9ca Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
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.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/InputCommon/ControllerInterface/Device.h')

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
-- 
cgit v1.2.3