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

Core: Reset memory watcher on same thread which allocates it

This commit is contained in:
Stenzek 2019-12-09 20:06:07 +10:00
parent 6f274092b6
commit c602cb2e2f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Core.cpp
View File

@ -295,9 +295,6 @@ void Stop() // - Hammertime!
ResetRumble(); ResetRumble();
#ifdef USE_MEMORYWATCHER
s_memory_watcher.reset();
#endif
} }
void DeclareAsCPUThread() void DeclareAsCPUThread()
@ -374,6 +371,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)