ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9326 from Subject38/wiimote_deadlock 

InputCommon: Fix callback dispatch deadlock
This commit is contained in:
Léo Lam 2020-12-15 01:16:59 +01:00 committed by GitHub
parent 2c2ec16b53 00ec25d520
commit ed1564515b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

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

1
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View File

@ -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();

6
Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp
View File

@ -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();
}