From 137f58a84aab54e487846b12e16164f60b9028a0 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Wed, 19 Jun 2024 18:49:49 +0800
Subject: [PATCH] refactor macos service for delegate again, remove runme in
 install service of linux

---
 src/platform/linux.rs                        |  2 --
 src/platform/macos.rs                        | 15 +++++----------
 src/platform/privileges_scripts/daemon.plist |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/platform/linux.rs b/src/platform/linux.rs
index cc0192fbf..7e8c15880 100644
--- a/src/platform/linux.rs
+++ b/src/platform/linux.rs
@@ -1397,8 +1397,6 @@ pub fn install_service() -> bool {
         Config::set_option("stop-service".into(), "Y".into());
         return true;
     }
-    run_me_with(2);
-    std::process::exit(0);
 }
 
 fn check_if_stop_service() {
diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index 0658fb889..ca3f0f75d 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -500,29 +500,24 @@ pub fn start_os_service() {
     let path =
         std::fs::canonicalize(std::env::current_exe().unwrap_or_default()).unwrap_or_default();
     let mut server = get_server_start_time(&mut sys, &path);
+    if server.is_none() {
+        log::error!("Agent not started yet, will restart --service to make delegate work",);
+        std::process::exit(-1);
+    }
     let my_start_time = sys
         .process((std::process::id() as usize).into())
         .map(|p| p.start_time())
         .unwrap_or_default() as i64;
     log::info!("Startime: {my_start_time} vs {:?}", server);
 
-    let uname = get_active_username();
     std::thread::spawn(move || loop {
         std::thread::sleep(std::time::Duration::from_secs(1));
-        let tmp = get_active_username();
-        // restart my self after login to make sure --server started earlier 
-        // so that not forbid user start main window because of delegate caught by --service
-        if uname != tmp {
-            log::info!("Console user changed from {uname} to {tmp}");
-            std::process::exit(-1);
-        }
         if server.is_none() {
             server = get_server_start_time(&mut sys, &path);
         }
         if let Some((start_time, pid)) = server {
             if my_start_time <= start_time {
-                // I tried add delegate (using tao and with its main loop0, but it works in normal mode, but not work as daemon
-                log::info!(
+                log::error!(
                     "Agent start later, {my_start_time} vs {start_time}, will restart --service to make delegate work",
                 );
                 std::process::exit(-1);
diff --git a/src/platform/privileges_scripts/daemon.plist b/src/platform/privileges_scripts/daemon.plist
index 004957e36..e1609d103 100644
--- a/src/platform/privileges_scripts/daemon.plist
+++ b/src/platform/privileges_scripts/daemon.plist
@@ -12,7 +12,7 @@
         <array>
         <string>/bin/sh</string>
         <string>-c</string>
-        <string>sleep 1.5; /Applications/RustDesk.app/Contents/MacOS/RustDesk --service</string>
+        <string>sleep 3; /Applications/RustDesk.app/Contents/MacOS/RustDesk --service</string>
         </array>
         <key>RunAtLoad</key>
         <true/>