From 00ec25d520f662c5c60d8b8cc9830687c3ce281f Mon Sep 17 00:00:00 2001
From: seth <seth@ske.moe>
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 <brainleq@users.noreply.github.com>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
---
 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 4f1651f361..84209a720b 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -50,6 +50,7 @@ public:
   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();
 
-- 
cgit v1.2.3