Fixed bug where system menu would hijack control when submenu opened …

…directly
PringlesGang · Sep 15, 2024 · ecb077d · ecb077d
1 parent e40f8d6
commit ecb077d
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/games/cclcc/systemmenu.cpp b/src/games/cclcc/systemmenu.cpp
@@ -58,12 +58,18 @@ void SystemMenu::Show() {
     State = Showing;
     MenuTransition.StartIn();
     MainItems->Show();
-    if (UI::FocusedMenu != 0) {
-      LastFocusedMenu = UI::FocusedMenu;
-      LastFocusedMenu->IsFocused = false;
+
+    // If the function was called due to a submenu opening directly,
+    // then don't take over focus
+    if (!(ScrWork[SW_SYSMENUCT] == 32 && ScrWork[SW_SYSSUBMENUCT] ||
+          ScrWork[2151])) {
+      if (UI::FocusedMenu != 0) {
+        LastFocusedMenu = UI::FocusedMenu;
+        LastFocusedMenu->IsFocused = false;
+      }
+      IsFocused = true;
+      UI::FocusedMenu = this;
     }
-    IsFocused = true;
-    UI::FocusedMenu = this;
   }
 }