From 00ec25d520f662c5c60d8b8cc9830687c3ce281f Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 13 Dec 2020 00:30:27 +0000 Subject: InputCommon: Fix callback dispatch deadlock Make sure m_is_populating_devices is true when a WM_INPUT_DEVICE_CHANGE event is received directly on the ciface thread, so that callbacks do not occur while removing devices. This breaks a hold-and-wait deadlock between the ciface thread and the CPU thread when using emulated Wiimotes. Co-authored-by: brainleq Co-authored-by: oldmud0 --- .../InputCommon/ControllerInterface/ControllerInterface.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index eabc2cd0f1..1d198ca494 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -140,6 +140,19 @@ void ControllerInterface::RefreshDevices() InvokeDevicesChangedCallbacks(); } +void ControllerInterface::PlatformPopulateDevices(std::function callback) +{ + if (!m_is_init) + return; + + m_is_populating_devices = true; + + callback(); + + m_is_populating_devices = false; + InvokeDevicesChangedCallbacks(); +} + // Remove all devices and call library cleanup functions void ControllerInterface::Shutdown() { -- cgit v1.2.3