summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorMai <mathew1800@gmail.com>2022-09-07 23:39:10 -0400
committerGitHub <noreply@github.com>2022-09-07 23:39:10 -0400
commit348db11bdb078b84086ee8da99688a21895b688e (patch)
tree2949c4948c2c4ceec73b8d4fb6c89a0a0002d730 /Source/Core/InputCommon/ControllerInterface
parentd84367e3742c7932b450cc0b625edcdf8f3db45c (diff)
parentb8ca1b2907230f2e1285bfdb9c5e3b373d49cf56 (diff)
Merge pull request #11040 from AdmiralCurtiss/update-references-deadlock
InputCommon: Fix deadlock in EmulatedController::UpdateReferences().
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/CoreDevice.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
index 227a1febbe..2280ddac3b 100644
--- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
@@ -238,6 +238,8 @@ public:
std::chrono::milliseconds confirmation_wait,
std::chrono::milliseconds maximum_wait) const;
+ std::recursive_mutex& GetDevicesMutex() const { return m_devices_mutex; }
+
protected:
// Exclusively needed when reading/writing "m_devices"
mutable std::recursive_mutex m_devices_mutex;