From d799446faf127bf9da1802ace633a6f4df27b399 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Apr 2015 18:12:25 -0400 Subject: [PATCH] Core: Don't display on-screen messages via DisplayMessage until emulation has begun --- Source/Core/Core/Core.cpp | 3 +++ 1 file changed, 3 insertions(+) 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) {