Merge pull request #9326 from Subject38/wiimote_deadlock

InputCommon: Fix callback dispatch deadlock
dolphin-emu · Dec 15, 2020 · ed15645 · ed15645
2 parents 2c2ec16 + 00ec25d
commit ed15645
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git 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()
 {

diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -50,6 +50,7 @@ class ControllerInterface : public ciface::Core::DeviceContainer
   void Shutdown();
   void AddDevice(std::shared_ptr<ciface::Core::Device> device);
   void RemoveDevice(std::function<bool(const ciface::Core::Device*)> callback);
+  void PlatformPopulateDevices(std::function<void()> callback);
   bool IsInit() const { return m_is_init; }
   void UpdateInput();
 

diff --git a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp
@@ -28,8 +28,10 @@ static LRESULT CALLBACK WindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARA
 {
   if (message == WM_INPUT_DEVICE_CHANGE)
   {
-    ciface::DInput::PopulateDevices(s_hwnd);
-    ciface::XInput::PopulateDevices();
+    g_controller_interface.PlatformPopulateDevices([] {
+      ciface::DInput::PopulateDevices(s_hwnd);
+      ciface::XInput::PopulateDevices();
+    });
     s_done_populating.Set();
   }