Merge pull request #9460 from jordan-woyak/wiimote-dc-crash-fix

WiimoteReal: Fix crash on real Wii Remote disconnect on Windows.
This commit is contained in:
Léo Lam 2021-01-27 13:14:52 +01:00 committed by GitHub
commit 2537ea77ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -916,7 +916,9 @@ static void TryToConnectBalanceBoard(std::unique_ptr<Wiimote> wm)
static void HandleWiimoteDisconnect(int index)
{
Core::RunAsCPUThread([index] {
g_wiimotes[index] = nullptr;
// The Wii Remote object must exist through the call to UpdateSource
// to prevent WiimoteDevice from having a dangling HIDWiimote pointer.
const auto temp_real_wiimote = std::move(g_wiimotes[index]);
WiimoteCommon::UpdateSource(index);
});
}