Merge pull request #8237 from JosJuice/memory-watcher-nullptr

Fix FIFO player crashing when USE_MEMORYWATCHER is defined
dolphin-emu · Jul 11, 2019 · 8d8d103 · 8d8d103
2 parents 398aa2a + 44fe581
commit 8d8d103
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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
 }