FullscreenUI: Fix load-and-resume-state HC popup

7 months ago · a310d3a5e7
parent 8e5531eaa2
commit a310d3a5e7
1 changed files with 6 additions and 2 deletions
--- a/src/core/fullscreen_ui.cpp
+++ b/src/core/fullscreen_ui.cpp
@ -1165,8 +1165,12 @@ void FullscreenUI::SwitchToMainWindow(MainWindowType type)
    return;

  s_state.current_main_window = type;
-  ImGui::SetWindowFocus(nullptr);
-  QueueResetFocus(FocusResetType::ViewChanged);
+  if (!AreAnyDialogsOpen())
+  {
+    ImGui::SetWindowFocus(nullptr);
+    QueueResetFocus(FocusResetType::ViewChanged);
+  }
+
  UpdateRunIdleState();
  FixStateIfPaused();
 }