From f2ab218eb1c14bc8ac36635562c949f31fdd722f Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Mon, 3 Jan 2022 04:41:34 +0100 Subject: [PATCH] Prioritize labels over strings in the dump address view --- src/gui/Src/Gui/CPUDump.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/Src/Gui/CPUDump.cpp b/src/gui/Src/Gui/CPUDump.cpp index adf3deff..cdfc5b5f 100644 --- a/src/gui/Src/Gui/CPUDump.cpp +++ b/src/gui/Src/Gui/CPUDump.cpp @@ -283,10 +283,10 @@ void CPUDump::getColumnRichText(int col, dsint rva, RichTextPainter::List & rich if(!DbgGetModuleAt(data, modname)) modname[0] = '\0'; char label_text[MAX_LABEL_SIZE] = ""; + char string_text[MAX_STRING_SIZE] = ""; if(DbgGetLabelAt(data, SEG_DEFAULT, label_text)) curData.text = QString(modname) + "." + QString(label_text); - char string_text[MAX_STRING_SIZE] = ""; - if(DbgGetStringAt(data, string_text)) + else if(DbgGetStringAt(data, string_text)) curData.text = string_text; if(!curData.text.length()) //stack comments {