diff --git a/Core/Console.cpp b/Core/Console.cpp index 4cb409fd..2aad07e5 100644 --- a/Core/Console.cpp +++ b/Core/Console.cpp @@ -580,6 +580,7 @@ void Console::ResetComponents(bool softReset) } _soundMixer->StopAudio(true); + _debugHud->ClearScreen(); _memoryManager->Reset(softReset); if(!_settings->CheckFlag(EmulationFlags::DisablePpuReset) || !softReset) { @@ -1001,6 +1002,7 @@ void Console::LoadState(istream &loadStream, uint32_t stateVersion) debugger->ResetCounters(); } + _debugHud->ClearScreen(); _notificationManager->SendNotification(ConsoleNotificationType::StateLoaded); } } diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp index 1f8ce7fd..f891a2a5 100644 --- a/Core/Debugger.cpp +++ b/Core/Debugger.cpp @@ -28,6 +28,7 @@ #include "Breakpoint.h" #include "CodeDataLogger.h" #include "NotificationManager.h" +#include "DebugHud.h" const int Debugger::BreakpointTypeCount; string Debugger::_disassemblerOutput = ""; @@ -1247,6 +1248,7 @@ void Debugger::RemoveScript(int32_t scriptId) if(script->GetScriptId() == scriptId) { //Send a ScriptEnded event before unloading the script script->ProcessEvent(EventType::ScriptEnded); + _console->GetDebugHud()->ClearScreen(); return true; } return false;