diff options
| author | Filoppi <filippotarpini@hotmail.it> | 2021-05-15 12:08:38 +0300 |
|---|---|---|
| committer | Filoppi <filippotarpini@hotmail.it> | 2021-06-07 11:07:05 +0300 |
| commit | c238e4911916e2a90e2e324873e0da4907d243c3 (patch) | |
| tree | 47ddda7e8ccb19b7fd43e28ccd05a135dd193b5b /Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | |
| parent | 2376aec135d957ee74bd2be1d587539dea4d5dab (diff) | |
ControllerInterface: Remove OSX window handle
also make it more thread safe (avoid rare deadlock)
and fix it trying to add devices before the CI has init
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 826659941d..9c91d853e7 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -116,6 +116,7 @@ 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 |
