diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-07-11 10:38:27 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 10:38:27 +1000 |
| commit | 8d8d1037398f0aebd4fcec478ace20dfef91e4cc (patch) | |
| tree | 08e68a1555aa610fc7e53b7a2186af4fad4508b7 /Source/Core | |
| parent | 398aa2a9f976169c4ac8228f0969971f3e2ba2f3 (diff) | |
| parent | 44fe5812b947bcf336b75b6e84386d1c920de8c3 (diff) | |
Merge pull request #8237 from JosJuice/memory-watcher-nullptr
Fix FIFO player crashing when USE_MEMORYWATCHER is defined
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Core.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 6dc471736e..8876ab6abd 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -133,7 +133,8 @@ void FrameUpdateOnCPUThread() void OnFrameEnd() { #ifdef USE_MEMORYWATCHER - s_memory_watcher->Step(); + if (s_memory_watcher) + s_memory_watcher->Step(); #endif } |