diff options
| author | Léo Lam <leo@leolam.fr> | 2020-12-15 01:16:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 01:16:59 +0100 |
| commit | ed1564515b7c4d9a72c56f28b98b571c18212599 (patch) | |
| tree | 17558412ce62432b266e117710473b7b1e7c803f /Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp | |
| parent | 2c2ec16b53312466cf793978f8f24555bc3d1ba0 (diff) | |
| parent | 00ec25d520f662c5c60d8b8cc9830687c3ce281f (diff) | |
Merge pull request #9326 from Subject38/wiimote_deadlock
InputCommon: Fix callback dispatch deadlock
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp index 67a31a062a..096ad31827 100644 --- 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(); } |