From 0e6d368970485098bfd5b39a0fa794794588391f Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Sat, 12 Aug 2023 15:10:38 +0800
Subject: [PATCH] fix --server not killed when stop service on mac

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

diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index 02fc828a6..6c5f19b9a 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -248,6 +248,10 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
                         .args(&["remove", &format!("{}_server", crate::get_full_name())])
                         .status()
                         .ok();
+                    std::process::Command::new("pkill")
+                        .arg(crate::get_app_name())
+                        .status()
+                        .ok();
                     if show_new_window {
                         std::process::Command::new("sh")
                             .arg("-c")
@@ -257,11 +261,6 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
                             ))
                             .spawn()
                             .ok();
-                    } else {
-                        std::process::Command::new("pkill")
-                            .arg(crate::get_app_name())
-                            .status()
-                            .ok();
                     }
                     quit_gui();
                 }