diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-12-29 20:17:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 20:17:04 +0100 |
| commit | 99fbc4b97ecc21c82a8cde602af1bf3b47a186d2 (patch) | |
| tree | c42b16871bed955e337895a8d3c42ee17cf164c8 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | |
| parent | bf0ac9de0ccf004b86ccadd0a0212fc6804d7600 (diff) | |
| parent | e456bef163c1b667ff5a045a4bda66b30326ae90 (diff) | |
Merge pull request #11885 from Filoppi/devices_deadlock_fix_v2
Input: Improve Controller Interface devices threading
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 6dc0afafe8..837e5135d5 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -127,7 +127,6 @@ private: std::list<std::function<void()>> m_devices_changed_callbacks; mutable std::recursive_mutex m_devices_population_mutex; - mutable std::mutex m_pre_population_mutex; mutable std::mutex m_callbacks_mutex; std::atomic<bool> m_is_init; // This is now always protected by m_devices_population_mutex, so |