From 8235bca664b31259a5ebb65b097c9ba64a92080b Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 4 Sep 2023 16:22:56 +0800
Subject: [PATCH] fix mac uninstall service

---
 src/platform/macos.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index fa6f630ca..78e52faf4 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -240,6 +240,11 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
                     uninstalled
                 );
                 if uninstalled {
+                    if !show_new_window {
+                        let _ = crate::ipc::close_all_instances();
+                        // leave ipc a little time
+                        std::thread::sleep(std::time::Duration::from_millis(300));
+                    }
                     crate::ipc::set_option("stop-service", "Y");
                     std::process::Command::new("launchctl")
                         .args(&["remove", &format!("{}_server", crate::get_full_name())])
@@ -255,13 +260,6 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
                             .spawn()
                             .ok();
                     }
-                    std::process::Command::new("pkill")
-                        .arg(crate::get_app_name())
-                        .status()
-                        .ok();
-                    let _ = crate::ipc::close_all_instances();
-                    // leave ipc a little time
-                    std::thread::sleep(std::time::Duration::from_millis(300));
                     quit_gui();
                 }
             }