From 36be1a8f7df4ff9a5fd43107c4f596ff6989486d Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Fri, 4 Jul 2025 17:20:59 +0700 Subject: [PATCH] FSUI: Fix default to game list behaviour --- pcsx2/ImGui/FullscreenUI.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 74208b62b1..7f0904f1f8 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -1118,7 +1118,17 @@ void FullscreenUI::ReturnToPreviousWindow() void FullscreenUI::ReturnToMainWindow() { ClosePauseMenu(); - s_current_main_window = VMManager::HasValidVM() ? MainWindowType::None : (ShouldDefaultToGameList() ? MainWindowType::GameList : MainWindowType::Landing); + + if (VMManager::HasValidVM()) + { + s_current_main_window = MainWindowType::None; + return; + } + + if (ShouldDefaultToGameList()) + SwitchToGameList(); + else + SwitchToLanding(); } bool FullscreenUI::LoadResources() @@ -3175,7 +3185,12 @@ void FullscreenUI::DrawSettingsWindow() } if (NavButton(ICON_PF_BACKWARD, true, true)) - SwitchToLanding(); + { + if (VMManager::HasValidVM()) + ReturnToPreviousWindow(); + else + SwitchToLanding(); + } if (s_game_settings_entry) {