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

fix --server not killed when stop service on mac

Browse Source
This commit is contained in:
rustdesk 2023-08-12 15:10:38 +08:00
parent 886fb73521
commit 0e6d368970
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform/macos.rs
View File

@ -248,6 +248,10 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
.args(&["remove", &format!("{}_server", crate::get_full_name())]) .args(&["remove", &format!("{}_server", crate::get_full_name())])
.status() .status()
.ok(); .ok();
std::process::Command::new("pkill")
.arg(crate::get_app_name())
.status()
.ok();
if show_new_window { if show_new_window {
std::process::Command::new("sh") std::process::Command::new("sh")
.arg("-c") .arg("-c")
@ -257,11 +261,6 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
)) ))
.spawn() .spawn()
.ok(); .ok();
} else {
std::process::Command::new("pkill")
.arg(crate::get_app_name())
.status()
.ok();
} }
quit_gui(); quit_gui();
} }