From e0dd45c35e295bda6e34d907bbb3f01580542e82 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 2 Feb 2021 01:56:28 +1000 Subject: [PATCH] FullscreenUI: Fix game list settings not applying --- src/frontend-common/fullscreen_ui.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp index 8e8b1d82a..7a66973ac 100644 --- a/src/frontend-common/fullscreen_ui.cpp +++ b/src/frontend-common/fullscreen_ui.cpp @@ -1078,8 +1078,6 @@ void DrawSettingsWindow() case SettingsPage::GameListSettings: { - EnsureGameListLoaded(); - BeginMenuButtons(); MenuHeading("Game List"); @@ -1089,8 +1087,10 @@ void DrawSettingsWindow() OpenFileSelector(ICON_FA_FOLDER_PLUS " Add Search Directory", true, [](const std::string& dir) { if (!dir.empty()) { - s_settings_interface->RemoveFromStringList("GameList", "RecursivePaths", dir.c_str()); - s_settings_interface->AddToStringList("GameList", "Paths", dir.c_str()); + s_settings_interface->AddToStringList("GameList", "RecursivePaths", dir.c_str()); + s_settings_interface->RemoveFromStringList("GameList", "Paths", dir.c_str()); + s_settings_interface->Save(); + QueueGameListRefresh(); } CloseFileSelector(); @@ -1116,7 +1116,8 @@ void DrawSettingsWindow() s_settings_interface->AddToStringList("GameList", "Paths", title.c_str()); } - s_host_interface->RunLater(SaveAndApplySettings); + s_settings_interface->Save(); + QueueGameListRefresh(); }); } @@ -1130,14 +1131,18 @@ void DrawSettingsWindow() s_settings_interface->RemoveFromStringList("GameList", "Paths", title.c_str()); s_settings_interface->RemoveFromStringList("GameList", "RecursivePaths", title.c_str()); - s_host_interface->RunLater(SaveAndApplySettings); + s_settings_interface->Save(); + QueueGameListRefresh(); CloseChoiceDialog(); }); } MenuHeading("Search Directories"); for (const GameList::DirectoryEntry& entry : s_host_interface->GetGameList()->GetSearchDirectories()) - ActiveButton(entry.path.c_str(), false, false); + { + MenuButton(entry.path.c_str(), entry.recursive ? "Scanning Subdirectories" : "Not Scanning Subdirectories", + false); + } EndMenuButtons(); }