diff --git a/Core/MIPS/MIPSStackWalk.cpp b/Core/MIPS/MIPSStackWalk.cpp index eb816a6ad0..60e38a0658 100644 --- a/Core/MIPS/MIPSStackWalk.cpp +++ b/Core/MIPS/MIPSStackWalk.cpp @@ -163,6 +163,11 @@ namespace MIPSStackWalk { std::vector Walk(u32 pc, u32 ra, u32 sp, u32 threadEntry, u32 threadStackTop) { std::vector frames; + + if (!Memory::IsValidAddress(pc) || !Memory::IsValidAddress(sp) || !Memory::IsValidAddress(ra)) { + return frames; + } + StackFrame current; current.pc = pc; current.sp = sp; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 72dacb1d35..39e0fc23e3 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -1643,7 +1643,7 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) { ImGui_ImplThin3d_Init(draw); } - if (imguiVisible_ && imguiInited_) { + if (imguiVisible_ && imguiInited_ && PSP_IsInited()) { _dbg_assert_(imDebugger_); ImGui_ImplPlatform_NewFrame(); diff --git a/UI/ImDebugger/ImDebugger.cpp b/UI/ImDebugger/ImDebugger.cpp index 9adde3ad2e..1e6d20fb6c 100644 --- a/UI/ImDebugger/ImDebugger.cpp +++ b/UI/ImDebugger/ImDebugger.cpp @@ -198,7 +198,7 @@ void DrawCallStacks(MIPSDebugInterface *debug, bool *open) { } void DrawModules(MIPSDebugInterface *debug, bool *open) { - if (!ImGui::Begin("Modules", open)) { + if (!ImGui::Begin("Modules", open) || !g_symbolMap) { ImGui::End(); return; }