feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

Merge pull request #2307 from lioncash/crash

Browse Source 
Core: Don't display on-screen messages via DisplayMessage until emulation has begun
This commit is contained in:
Matthew Parlane
2015-04-21 11:08:07 +12:00
parent d27b8673f5 d799446faf
commit b0db4f53cc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,9 @@ std::string StopMessage(bool bMainThread, std::string Message)
void DisplayMessage(const std::string& message, int time_in_ms) void DisplayMessage(const std::string& message, int time_in_ms)
{ {
if (!IsRunning())
return;
// Actually displaying non-ASCII could cause things to go pear-shaped // Actually displaying non-ASCII could cause things to go pear-shaped
for (const char& c : message) for (const char& c : message)
{ {