From f665878b3c87b57500f2c4a2f157286b4df7acfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 28 Nov 2024 00:15:58 +0100 Subject: [PATCH] Fix crash with mismatched pushfont/popfont --- UI/ImDebugger/ImDisasmView.cpp | 11 +++++------ UI/ImDebugger/ImDisasmView.h | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UI/ImDebugger/ImDisasmView.cpp b/UI/ImDebugger/ImDisasmView.cpp index 118cbf212f..6e55916b9e 100644 --- a/UI/ImDebugger/ImDisasmView.cpp +++ b/UI/ImDebugger/ImDisasmView.cpp @@ -315,6 +315,11 @@ void ImDisasmView::drawArguments(ImDrawList *drawList, Rect rc, const Disassembl } void ImDisasmView::Draw(ImDrawList *drawList) { + auto memLock = Memory::Lock(); + if (!debugger->isAlive()) { + return; + } + // TODO: Don't need to do these every frame. ImGui_PushFixedFont(); @@ -355,11 +360,6 @@ void ImDisasmView::Draw(ImDrawList *drawList) { visibleRows_ = (int)((rect.bottom - rect.top + rowHeight_ - 1.f) / rowHeight_); - auto memLock = Memory::Lock(); - if (!debugger->isAlive()) { - return; - } - unsigned int address = windowStart_; std::map addressPositions; @@ -494,7 +494,6 @@ void ImDisasmView::Draw(ImDrawList *drawList) { PopupMenu(); drawList->PopClipRect(); - } void ImDisasmView::ScrollRelative(int amount) { diff --git a/UI/ImDebugger/ImDisasmView.h b/UI/ImDebugger/ImDisasmView.h index 088ce753ac..5926367209 100644 --- a/UI/ImDebugger/ImDisasmView.h +++ b/UI/ImDebugger/ImDisasmView.h @@ -1,4 +1,5 @@ #pragma once + #include #include #include