diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-04-21 11:08:07 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-04-21 11:08:07 +1200 |
| commit | b0db4f53ccf081c4c9ce7a3ac930cb5ebca1857a (patch) | |
| tree | 607bb24238cab64edf3d2a4caa0fc8b1619c6d22 /Source | |
| parent | d27b8673f55b9cca4208542ef9a15744749688d2 (diff) | |
| parent | d799446faf127bf9da1802ace633a6f4df27b399 (diff) | |
Merge pull request #2307 from lioncash/crash
Core: Don't display on-screen messages via DisplayMessage until emulation has begun
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Core.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index c3bbaa4515..b3c1efe461 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -140,6 +140,9 @@ std::string StopMessage(bool bMainThread, std::string Message) void DisplayMessage(const std::string& message, int time_in_ms) { + if (!IsRunning()) + return; + // Actually displaying non-ASCII could cause things to go pear-shaped for (const char& c : message) { |