Regenerate presets when restoring game settings to default

Author: yungcomputerchair

app/settings/GameSettingsTab.tsx

@@ -36,6 +36,10 @@ export default function GameSettingsTab({
 
   const ctx = useContext(SettingsCtx);
 
+  useEffect(() => {
+    setLaunchProfiles(currentProfiles);
+  }, [currentProfiles]);
+
   useEffect(() => {
     getDebugMode().then(setDebug);
   }, [active]);

app/settings/page.tsx

@@ -118,8 +118,8 @@ export default function SettingsPage() {
   const doInit = async () => {
     try {
       await invoke("reload_state");
-      await syncConfig();
       await syncLaunchProfiles();
+      await syncConfig();
       setInitialFetchDone(true);
     } catch (e) {
       alertError("Error during init: " + e);
@@ -171,6 +171,7 @@ export default function SettingsPage() {
     } else {
       await resetGameSettings();
     }
+    await syncLaunchProfiles();
     const updatedConfig = await syncConfig();
     return updatedConfig.game;
   };

src-tauri/src/lib.rs

@@ -31,7 +31,7 @@ use log::*;
 use tauri::Manager;
 use uuid::Uuid;
 
-use crate::state::{LaunchProfile, LaunchProfilesView};
+use crate::state::{LaunchProfile, LaunchProfiles, LaunchProfilesView};
 
 type Error = Box<dyn std::error::Error>;
 type Result<T> = std::result::Result<T, Error>;
@@ -1349,9 +1349,15 @@ async fn reset_launcher_config(app_handle: tauri::AppHandle) -> CommandResult<()
 #[tauri::command]
 async fn reset_game_config(app_handle: tauri::AppHandle) -> CommandResult<()> {
     debug!("reset_game_config");
-    let default_game_config = config::GameSettings::default();
+    let mut default_game_config = config::GameSettings::default();
     let state = app_handle.state::<Mutex<AppState>>();
     let mut state = state.lock().await;
+
+    state.launch_profiles.reload_presets();
+    if let Some(new_default_profile) = state.launch_profiles.get_default() {
+        default_game_config.launch_profile = new_default_profile.get_id();
+    }
+
     state.config.game = default_game_config;
     state.write_config = true;
     state.save();

src-tauri/src/state.rs

@@ -692,6 +692,15 @@ impl LaunchProfiles {
         !self.profiles.is_empty()
     }
 
+    pub fn reload_presets(&mut self) {
+        // remove all existing presets
+        self.profiles.retain(|p| !p.is_preset());
+        // add fresh presets in
+        let mut presets = Self::load_presets();
+        presets.profiles.extend(self.profiles.clone());
+        *self = presets;
+    }
+
     #[allow(deprecated)]
     fn load(config: &mut Config) -> Self {
         const CUSTOM_PROFILE_NAME: &str = "Custom Profile";
@@ -704,15 +713,12 @@ impl LaunchProfiles {
                 profiles
             }
             Err(_) => {
-                info!("Loading preset launch profiles");
-                let mut profiles = util::get_preset_launch_profiles();
+                let mut profiles = Self::load_presets();
                 if let Some(current_cmd) = config.game.launch_command.as_ref() {
-                    let profile = LaunchProfile::new(CUSTOM_PROFILE_NAME, current_cmd, false);
-                    let profile_id = profile.get_id();
-                    profiles.push(profile);
+                    let profile_id = profiles.add_entry(CUSTOM_PROFILE_NAME, current_cmd);
                     config.game.launch_profile = profile_id;
                 }
-                Self { profiles }
+                profiles
             }
         };
 
@@ -740,6 +746,12 @@ impl LaunchProfiles {
         let commands: Self = serde_json::from_str(&commands_str)?;
         Ok(commands)
     }
+
+    fn load_presets() -> Self {
+        info!("Loading preset launch profiles");
+        let profiles = util::get_preset_launch_profiles();
+        Self { profiles }
+    }
 }
 
 /// Frontend view of launch profiles, with the computed default profile ID