diff options
| author | Mai <mathew1800@gmail.com> | 2022-09-07 23:39:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 23:39:10 -0400 |
| commit | 348db11bdb078b84086ee8da99688a21895b688e (patch) | |
| tree | 2949c4948c2c4ceec73b8d4fb6c89a0a0002d730 /Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | |
| parent | d84367e3742c7932b450cc0b625edcdf8f3db45c (diff) | |
| parent | b8ca1b2907230f2e1285bfdb9c5e3b373d49cf56 (diff) | |
Merge pull request #11040 from AdmiralCurtiss/update-references-deadlock
InputCommon: Fix deadlock in EmulatedController::UpdateReferences().
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp index 7aec56115c..0a3de3e391 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp @@ -40,7 +40,7 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock() void EmulatedController::UpdateReferences(const ControllerInterface& devi) { - const auto lock = GetStateLock(); + std::scoped_lock lk(s_get_state_mutex, devi.GetDevicesMutex()); m_default_device_is_connected = devi.HasConnectedDevice(m_default_device); |