remove thread stuff, set cwd properly when openening migoto

src-tauri/src/system_helpers.rs

@@ -2,11 +2,8 @@ use duct::cmd;
 
 #[tauri::command]
 pub fn run_program(path: String) {
-  // Open in new thread to prevent blocking.
-  std::thread::spawn(move || {
   // Without unwrap_or, this can crash when UAC prompt is denied
   open::that(&path).unwrap_or(());
-  });
 }
 
 #[tauri::command]
@@ -18,11 +15,11 @@ pub fn run_program_relative(path: String) {
   let mut path_buf = std::path::PathBuf::from(&path);
   path_buf.pop();
 
-  // Open in new thread to prevent blocking.
+  // Set new working directory
-  std::thread::spawn(move || {
+  std::env::set_current_dir(&path_buf).unwrap();
+
   // Without unwrap_or, this can crash when UAC prompt is denied
   open::that(&path).unwrap_or(());
-  });
 
   // Restore the original working directory
   std::env::set_current_dir(&cwd).unwrap();

src/ui/components/ServerLaunchSection.tsx

@@ -202,11 +202,15 @@ export default class ServerLaunchSection extends React.Component<{}, IState> {
   async launchMigoto() {
     const config = await getConfig()
 
-    // Get game exe from game path, so we can watch it
+    if (!config.migoto_path) return alert('Migoto not installed or set!')
-    const pathArr = config.game_install_path.replace(/\\/g, '/').split('/')
-    const gameExec = pathArr[pathArr.length - 1]
 
-    await this.playGame(config.migoto_path, gameExec)
+    // Get game exe from game path, so we can watch it
+    const pathArr = config.migoto_path.replace(/\\/g, '/').split('/')
+    const migotoExec = pathArr[pathArr.length - 1]
+
+    await invoke('run_program_relative', { path: config.migoto_path })
+
+    await this.playGame()
   }
 
   setIp(text: string) {