Merge pull request #12512 from JosJuice/assembler-dirty-flag

DolphinQt: Rework dirty flag handling in AssemblerWidget::TabTextForEditor

1 files changed, 14 insertions, 12 deletions

diff --git a/Source/Core/DolphinQt/Debugger/AssemblerWidget.cpp b/Source/Core/DolphinQt/Debugger/AssemblerWidget.cpp
index a8d2dc96f3..f8cb60deb6 100644
--- a/Source/Core/DolphinQt/Debugger/AssemblerWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/AssemblerWidget.cpp
@@ -698,21 +698,23 @@ void AssemblerWidget::OnTabChange(int index)
 QString AssemblerWidget::TabTextForEditor(AsmEditor* editor, bool with_dirty)
 {
   ASSERT(editor != nullptr);
-  QString dirtyFlag = QStringLiteral();
-  if (editor->IsDirty() && with_dirty)
-  {
-    dirtyFlag = QStringLiteral(" *");
-  }
 
-  if (editor->Path().isEmpty())
+  QString result;
+  if (!editor->Path().isEmpty())
+    result = editor->EditorTitle();
+  else if (editor->EditorNum() == 0)
+    result = tr("New File");
+  else
+    result = tr("New File (%1)").arg(editor->EditorNum() + 1);
+
+  if (with_dirty && editor->IsDirty())
   {
-    if (editor->EditorNum() == 0)
-    {
-      return tr("New File%1").arg(dirtyFlag);
-    }
-    return tr("New File (%1)%2").arg(editor->EditorNum() + 1).arg(dirtyFlag);
+    // i18n: This asterisk is added to the title of an editor to indicate that it has unsaved
+    // changes
+    result = tr("%1 *").arg(result);
   }
-  return tr("%1%2").arg(editor->EditorTitle()).arg(dirtyFlag);
+
+  return result;
 }
 
 AsmEditor* AssemblerWidget::GetEditor(int idx)