FullscreenUI: Fix toggling between windows with hotkeys

And toggling one window toggling a different window instead.

src/core/fullscreenui.cpp

@@ -352,8 +352,8 @@ void FullscreenUI::OpenPauseMenu()
   });
 }
 
-void FullscreenUI::PauseAndToggleMenuFromCoreThread(void (*open_callback)(), void (*restored_callback)(),
-                                                    float transition_time)
+void FullscreenUI::PauseAndToggleMenuFromCoreThread(MainWindowType expected_main_window, void (*open_callback)(),
+                                                    void (*restored_callback)(), float transition_time)
 {
   DebugAssert(Host::IsOnCoreThread());
   if (!System::IsValid())
@@ -361,7 +361,8 @@ void FullscreenUI::PauseAndToggleMenuFromCoreThread(void (*open_callback)(), voi
 
   const bool was_paused = System::IsPaused();
   bool should_pause = false;
-  VideoThread::RunOnThreadAndSync([open_callback, restored_callback, transition_time, was_paused, &should_pause]() {
+  VideoThread::RunOnThreadAndSync(
+    [open_callback, restored_callback, transition_time, expected_main_window, was_paused, &should_pause]() {
       Initialize();
 
       // Dialogs cannot be hidden safely, since doing so would leave their callbacks pending while the game is running.
@@ -370,7 +371,8 @@ void FullscreenUI::PauseAndToggleMenuFromCoreThread(void (*open_callback)(), voi
         return;
 
       // Hide the current window without disturbing the state it owns.
-    if (s_locals.current_main_window != MainWindowType::None)
+      if ((expected_main_window == MainWindowType::None) ? (s_locals.current_main_window != MainWindowType::None) :
+                                                           (s_locals.current_main_window == expected_main_window))
       {
         s_locals.toggled_main_window = s_locals.current_main_window;
         BeginTransition(TransitionEffect::ZoomOut, SHORT_TRANSITION_TIME, []() {
@@ -385,8 +387,12 @@ void FullscreenUI::PauseAndToggleMenuFromCoreThread(void (*open_callback)(), voi
 
       // Restore the hidden window, or invoke the requested open action when there is no saved window. Start the
       // transition before requesting the pause so an extra frame does not display the pause icon.
+      if (s_locals.current_main_window == MainWindowType::None)
         s_locals.was_paused_on_quick_menu_open = was_paused;
-    const bool restoring = (s_locals.toggled_main_window != MainWindowType::None);
+
+      const bool restoring = (expected_main_window == MainWindowType::None) ?
+                               (s_locals.toggled_main_window != MainWindowType::None) :
+                               (s_locals.toggled_main_window == expected_main_window);
       BeginTransition(TransitionEffect::ZoomIn, transition_time, [open_callback, restored_callback, restoring]() {
         ForceKeyNavEnabled();
         EnqueueSoundEffect(SFX_NAV_ACTIVATE);
@@ -416,6 +422,7 @@ void FullscreenUI::PauseAndToggleMenuFromCoreThread(void (*open_callback)(), voi
 void FullscreenUI::TogglePauseMenu()
 {
   PauseAndToggleMenuFromCoreThread(
+    MainWindowType::None,
     []() {
       UpdateAchievementsPauseScreenInfo();
       s_locals.current_pause_submenu = PauseSubMenu::None;
@@ -426,7 +433,9 @@ void FullscreenUI::TogglePauseMenu()
 
 void FullscreenUI::ToggleCheatsMenu()
 {
-  PauseAndToggleMenuFromCoreThread([]() {
+  PauseAndToggleMenuFromCoreThread(
+    MainWindowType::Settings,
+    []() {
       if (!SwitchToGameSettings(SettingsPage::Cheats))
       {
         // We'll end up here when we're in batch mode and using a runtime-populated game list entry. There _might_ be
@@ -434,6 +443,11 @@ void FullscreenUI::ToggleCheatsMenu()
         // transition and not noticeable. That's what you get for not using the game list.
         SwitchToMainWindow(MainWindowType::Settings);
       }
+    },
+    []() {
+      // Ensure we're on the settings page.
+      if (GetCurrentSettingsPage() != SettingsPage::Cheats && !SwitchToGameSettings(SettingsPage::Cheats))
+        SwitchToMainWindow(MainWindowType::Settings);
     });
 }
 

src/core/fullscreenui_achievements.cpp

@@ -1743,7 +1743,7 @@ void FullscreenUI::ToggleAchievementsWindow()
     return;
   }
 
-  PauseAndToggleMenuFromCoreThread(&FullscreenUI::SwitchToAchievements);
+  PauseAndToggleMenuFromCoreThread(MainWindowType::Achievements, &FullscreenUI::SwitchToAchievements);
 }
 
 void FullscreenUI::AddSubsetInfo(const rc_client_subset_t* subset)
@@ -2723,7 +2723,7 @@ void FullscreenUI::ToggleLeaderboardsWindow()
     return;
   }
 
-  PauseAndToggleMenuFromCoreThread(&FullscreenUI::SwitchToLeaderboards);
+  PauseAndToggleMenuFromCoreThread(MainWindowType::Leaderboards, &FullscreenUI::SwitchToLeaderboards);
 }
 
 void FullscreenUI::SwitchToLeaderboards()

src/core/fullscreenui_private.h

@@ -64,7 +64,8 @@ bool AreAnyDialogsOpen();
 bool AreAnyDialogsInteractable();
 
 void PauseAndOpenMenuFromCoreThread(void (*callback)());
-void PauseAndToggleMenuFromCoreThread(void (*open_callback)(), void (*restored_callback)() = nullptr,
+void PauseAndToggleMenuFromCoreThread(MainWindowType expected_main_window, void (*open_callback)(),
+                                      void (*restored_callback)() = nullptr,
                                       float transition_time = SHORT_TRANSITION_TIME);
 void ClosePauseMenu(TransitionEffect effect = TransitionEffect::Fade, float transition_time = SHORT_TRANSITION_TIME);
 void ClosePauseMenuImmediately();