Merge pull request #5246 from myk002/myk_difficulty_focus

[Gui] don't add suffix to focus string for non-difficulty tabs
DFHack · Feb 3, 2025 · ee5b192 · ee5b192
2 parents bca91ec + 149f590
commit ee5b192
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
@@ -817,11 +817,12 @@ static void add_main_interface_focus_strings(const string &baseFocus, vector<str
         newFocusString = baseFocus;
         newFocusString += "/Settings";
         newFocusString += '/' + enum_item_key(game->main_interface.settings.current_mode);
-        if (game->main_interface.settings.doing_custom_settings)
-            newFocusString += "/CustomSettings";
-        else
-            newFocusString += "/Default";
-
+        if (game->main_interface.settings.current_mode == df::settings_tab_type::DIFFICULTY) {
+            if (game->main_interface.settings.doing_custom_settings)
+                newFocusString += "/CustomSettings";
+            else
+                newFocusString += "/Default";
+        }
         focusStrings.push_back(newFocusString);
     }
     if (game->main_interface.adventure.aim_projectile.open) {