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

remove thread stuff, set cwd properly when openening migoto

Browse Source
This commit is contained in:
SpikeHD
2022-07-21 23:25:55 -07:00
parent 940943b106
commit c659979851
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(());
});
// 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.
std::thread::spawn(move || {
// Without unwrap_or, this can crash when UAC prompt is denied
open::that(&path).unwrap_or(());
});
// Set new working directory
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();