Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2026-02-05 17:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #204 from NotThorny/Fix-SettingsArgs

Browse Source 
Fix args in settings
This commit is contained in:
SpikeHD
2023-10-01 01:58:48 -07:00
committed by GitHub
parent 6d53f344ac 680c6b04a4
commit a32d7186df
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/src/config.rs
View File

@@ -28,6 +28,8 @@ pub struct Configuration {
pub auto_mongodb: Option<bool>, pub auto_mongodb: Option<bool>,
pub un_elevated: Option<bool>, pub un_elevated: Option<bool>,
pub redirect_more: Option<bool>, pub redirect_more: Option<bool>,
pub launch_args: Option<String>,
pub offline_mode: Option<bool>,
} }
pub fn config_path() -> PathBuf { pub fn config_path() -> PathBuf {

14
src/ui/components/ServerLaunchSection.tsx
View File

@@ -217,10 +217,16 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
args: config.launch_args, args: config.launch_args,
}) })
} else { } else {
await invoke('run_program_relative', { if (config.launch_args.length < 1) {
path: exe || config.game_install_path, // Run relative when there are no args
args: config.launch_args, await invoke('run_program_relative', { path: exe || config.game_install_path })
}) } else {
// Run directly when there are args
await invoke('run_program', {
path: exe || config.game_install_path,
args: config.launch_args,
})
}
} }
else alert('Game not found! At: ' + (exe || config.game_install_path)) else alert('Game not found! At: ' + (exe || config.game_install_path))
} }