diff options
| author | Stenzek <stenzek@gmail.com> | 2019-12-09 20:06:07 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2019-12-09 20:06:14 +1000 |
| commit | c602cb2e2f229136b86edcbf3bd0a7ece81c5ff4 (patch) | |
| tree | 5458801c8d58fa14857f678b9c921b0e1b16394c /Source | |
| parent | 6f274092b64de3c3b74a0b2c5437b8ee0067db3d (diff) | |
Core: Reset memory watcher on same thread which allocates it
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Core.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index b6d0dd1d1a..774fac41ce 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -295,9 +295,6 @@ void Stop() // - Hammertime! ResetRumble(); -#ifdef USE_MEMORYWATCHER - s_memory_watcher.reset(); -#endif } 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. CPU::Run(); +#ifdef USE_MEMORYWATCHER + s_memory_watcher.reset(); +#endif + s_is_started = false; if (_CoreParameter.bFastmem) |