From e1254c0b2415baaf8ea5be7b2fd38b8c12d93f0a Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Sun, 19 Feb 2023 21:11:17 +0800
Subject: [PATCH] macos better alert

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 libs/hbb_common/examples/system_message.rs | 11 +++++-----
 libs/hbb_common/src/platform/mod.rs        | 25 +++++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/libs/hbb_common/examples/system_message.rs b/libs/hbb_common/examples/system_message.rs
index 347bec47f..0be788428 100644
--- a/libs/hbb_common/examples/system_message.rs
+++ b/libs/hbb_common/examples/system_message.rs
@@ -6,14 +6,15 @@ use hbb_common::platform::macos;
 
 fn main() {
     #[cfg(target_os = "linux")]
-    linux::system_message("test title", "test message", true).ok();
+    let res = linux::system_message("test title", "test message", true);
     #[cfg(target_os = "macos")]
-    macos::alert(
-        "RustDesk".to_owned(),
+    let res = macos::alert(
+        "System Preferences".to_owned(),
         "warning".to_owned(),
         "test title".to_owned(),
         "test message".to_owned(),
         ["Ok".to_owned()].to_vec(),
-    )
-    .ok();
+    );
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    println!("result {:?}", &res);
 }
diff --git a/libs/hbb_common/src/platform/mod.rs b/libs/hbb_common/src/platform/mod.rs
index 89a3a1569..0a4299ae2 100644
--- a/libs/hbb_common/src/platform/mod.rs
+++ b/libs/hbb_common/src/platform/mod.rs
@@ -41,14 +41,23 @@ extern "C" fn breakdown_signal_handler(sig: i32) {
         )
         .ok();
         #[cfg(target_os = "macos")]
-        macos::alert(
-            "RustDesk".to_owned(),
-            "critical".to_owned(),
-            "Crashed".to_owned(),
-            format!("Got signal {} and exit.{}", sig, info),
-            ["Ok".to_owned()].to_vec(),
-        )
-        .ok();
+        {
+            use std::sync::mpsc::channel;
+            use std::time::Duration;
+            let (tx, rx) = channel();
+            std::thread::spawn(move || {
+                macos::alert(
+                    "System Preferences".to_owned(),
+                    "critical".to_owned(),
+                    "RustDesk Crashed".to_owned(),
+                    format!("Got signal {} and exit.{}", sig, info),
+                    ["Ok".to_owned()].to_vec(),
+                )
+                .ok();
+                let _ = tx.send(());
+            });
+            let _ = rx.recv_timeout(Duration::from_millis(1_000));
+        }
     }
     exit(0);
 }