From c238e4911916e2a90e2e324873e0da4907d243c3 Mon Sep 17 00:00:00 2001 From: Filoppi Date: Sat, 15 May 2021 12:08:38 +0300 Subject: 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 --- Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h') 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> 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 m_is_init; // This is now always protected by m_devices_population_mutex, so -- cgit v1.2.3