piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8518 from stenzek/more-wiimote-reset-crashes

Browse Source 
Core: Reset Wiimotes/rumble/memwatcher on emu thread
This commit is contained in:
Connor McLaughlin
2019-12-13 13:44:22 +10:00
committed by GitHub
parent 0cb3257d3f e5485ca499
commit a980a39807
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/Core.cpp
View File

@ -289,15 +289,6 @@ void Stop() // - Hammertime!
g_video_backend->Video_ExitLoop(); g_video_backend->Video_ExitLoop();
} }
if (_CoreParameter.bWii)
Wiimote::ResetAllWiimotes();
ResetRumble();
#ifdef USE_MEMORYWATCHER
s_memory_watcher.reset();
#endif
} }
void DeclareAsCPUThread() void DeclareAsCPUThread()
@ -374,6 +365,10 @@ static void CpuThread(const std::optional<std::string>& savestate_path, bool del
// Enter CPU run loop. When we leave it - we are done. // Enter CPU run loop. When we leave it - we are done.
CPU::Run(); CPU::Run();
#ifdef USE_MEMORYWATCHER
s_memory_watcher.reset();
#endif
s_is_started = false; s_is_started = false;
if (_CoreParameter.bFastmem) if (_CoreParameter.bFastmem)
@ -533,7 +528,12 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
return; return;
if (init_wiimotes) if (init_wiimotes)
{
Wiimote::ResetAllWiimotes();
Wiimote::Shutdown(); Wiimote::Shutdown();
}
ResetRumble();
Keyboard::Shutdown(); Keyboard::Shutdown();
Pad::Shutdown(); Pad::Shutdown();