hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix uninstall service on mac from main window because of ipc close

Browse Source 
myself
This commit is contained in:
rustdesk 2023-08-13 19:51:02 +08:00
parent 722b82e1a5
commit 4b33ee6309
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/macos.rs
View File

@ -241,9 +241,6 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
); );
if uninstalled { if uninstalled {
crate::ipc::set_option("stop-service", "Y"); crate::ipc::set_option("stop-service", "Y");
let _ = crate::ipc::close_all_instances();
// leave ipc a little time
std::thread::sleep(std::time::Duration::from_millis(300));
std::process::Command::new("launchctl") std::process::Command::new("launchctl")
.args(&["remove", &format!("{}_server", crate::get_full_name())]) .args(&["remove", &format!("{}_server", crate::get_full_name())])
.status() .status()
@ -262,6 +259,9 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
.arg(crate::get_app_name()) .arg(crate::get_app_name())
.status() .status()
.ok(); .ok();
let _ = crate::ipc::close_all_instances();
// leave ipc a little time
std::thread::sleep(std::time::Duration::from_millis(300));
quit_gui(); quit_gui();
} }
} }