FSUI: Fix default to game list behaviour

This commit is contained in:
KamFretoZ authored and Ty committed 2025-07-04 14:47:19 -04:00
1 parent 691c3764ac
commit 36be1a8f7d
1 file changed
+17 -2
+17 -2
View File
@@ -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)
{