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

WiimoteReal: Fix crash on real Wii Remote disconnect on Windows caused by dangling pointer.

This commit is contained in:
Jordan Woyak 2021-01-20 17:23:56 -06:00
parent 4705af59c6
commit bb2c50ac94
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -916,7 +916,9 @@ static void TryToConnectBalanceBoard(std::unique_ptr<Wiimote> wm)
static void HandleWiimoteDisconnect(int index) static void HandleWiimoteDisconnect(int index)
{ {
Core::RunAsCPUThread([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); WiimoteCommon::UpdateSource(index);
}); });
} }