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

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

Fix FIFO player crashing when USE_MEMORYWATCHER is defined
This commit is contained in:
Connor McLaughlin 2019-07-11 10:38:27 +10:00 committed by GitHub
parent 398aa2a9f9 44fe5812b9
commit 8d8d103739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Core.cpp
View File

@ -133,7 +133,8 @@ void FrameUpdateOnCPUThread()
void OnFrameEnd() void OnFrameEnd()
{ {
#ifdef USE_MEMORYWATCHER #ifdef USE_MEMORYWATCHER
s_memory_watcher->Step(); if (s_memory_watcher)
s_memory_watcher->Step();
#endif #endif
} }