Merge pull request #9326 from Subject38/wiimote_deadlock

InputCommon: Fix callback dispatch deadlock

1 files changed, 13 insertions, 0 deletions

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<void()> 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()
 {