Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-13 23:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix args

Browse Source
This commit is contained in:
Thoronium
2023-04-22 15:41:54 -06:00
parent 2fa203163d
commit 6ac0182784
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src-tauri/src/system_helpers.rs
View File

@@ -11,7 +11,16 @@ use registry::{Data, Hive, Security};
#[tauri::command]
pub fn run_program(path: String, args: Option<String>) {
// Without unwrap_or, this can crash when UAC prompt is denied
open::that(format!("{} {}", &path, &args.unwrap_or_else(|| "".into()))).unwrap_or(());
match open::with(
format!(
"{} {}",
path, args.unwrap_or_else(|| "".into())
),
path.clone(),
) {
Ok(_) => (),
Err(e) => println!("Failed to open program ({}): {}", &path, e),
};
}
#[tauri::command]
@@ -80,12 +89,12 @@ pub fn run_jar(path: String, execute_in: String, java_path: String) {
}
#[tauri::command]
pub fn run_un_elevated(path: String) {
pub fn run_un_elevated(path: String, args: Option<String>) {
// Open the program non-elevated.
match open::with(
format!(
"cmd /min /C \"set __COMPAT_LAYER=RUNASINVOKER && start \"\" \"{}\"\"",
path
"cmd /min /C \"set __COMPAT_LAYER=RUNASINVOKER && start \"\" \"{}\"\" {}",
path, args.unwrap_or_else(|| "".into())
),
"C:\\Windows\\System32\\cmd.exe",
) {