Add support for launch parameters

3 files changed, 10 insertions, 2 deletions

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 5d71713a..6553ed4e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -474,6 +474,7 @@ pub enum InstallType {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct GameInstall {
     pub game_path: String,
+    pub launch_parameters: String,
     pub install_type: InstallType,
 }
 
@@ -575,7 +576,7 @@ fn launch_northstar_steam(
         return Err("Couldn't access Titanfall2 directory".to_string());
     }
 
-    match open::that(format!("steam://run/{}//--northstar/", TITANFALL2_STEAM_ID)) {
+    match open::that(format!("steam://run/{}//--northstar {}/", TITANFALL2_STEAM_ID, game_install.launch_parameters)) {
         Ok(()) => Ok("Started game".to_string()),
         Err(_err) => Err("Failed to launch Titanfall 2 via Steam".to_string()),
     }
diff --git a/src-tauri/src/northstar/install.rs b/src-tauri/src/northstar/install.rs
index 875458dd..71da515d 100644
--- a/src-tauri/src/northstar/install.rs
+++ b/src-tauri/src/northstar/install.rs
@@ -174,6 +174,7 @@ pub fn find_game_install_location() -> Result<GameInstall, String> {
                     // println!("{:#?}", app);
                     let game_install = GameInstall {
                         game_path: app.path.to_str().unwrap().to_string(),
+                        launch_parameters: "".to_string(),
                         install_type: InstallType::STEAM,
                     };
                     return Ok(game_install);
diff --git a/src-tauri/src/northstar/mod.rs b/src-tauri/src/northstar/mod.rs
index 47510dbd..2630ff1f 100644
--- a/src-tauri/src/northstar/mod.rs
+++ b/src-tauri/src/northstar/mod.rs
@@ -109,8 +109,14 @@ pub fn launch_northstar(
             || matches!(game_install.install_type, InstallType::UNKNOWN))
     {
         let ns_exe_path = format!("{}/NorthstarLauncher.exe", game_install.game_path);
+        let ns_params: Vec<&str> = game_install.launch_parameters.split_whitespace().collect();
+
+        let mut args = vec!["/C", "start", "", &ns_exe_path];
+        // We cannot add the params directly because of limitations with cmd.exe
+        // https://stackoverflow.com/questions/9964865/c-system-not-working-when-there-are-spaces-in-two-different-parameters/9965141#9965141
+        args.extend(ns_params);
         let _output = std::process::Command::new("C:\\Windows\\System32\\cmd.exe")
-            .args(["/C", "start", "", &ns_exe_path])
+            .args(args)
             .spawn()
             .expect("failed to execute process");
         return Ok("Launched game".to_string());