Skip to content
Permalink
Browse files

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

Fix FIFO player crashing when USE_MEMORYWATCHER is defined
  • Loading branch information...
stenzek committed Jul 11, 2019
2 parents 398aa2a + 44fe581 commit 8d8d1037398f0aebd4fcec478ace20dfef91e4cc
Showing with 2 additions and 1 deletion.
  1. +2 −1 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
}

0 comments on commit 8d8d103

Please sign in to comment.
You can’t perform that action at this time.