From 8840e63c1c2693b5b8b0b0e43ef326fd7a92124f Mon Sep 17 00:00:00 2001
From: huzibaca <masterorigin91@gmail.com>
Date: Wed, 20 Nov 2024 01:04:55 +0800
Subject: [PATCH] fix: exit_app does not work

---
 src-tauri/src/cmds.rs          | 2 +-
 src-tauri/src/feat.rs          | 5 -----
 src-tauri/src/utils/resolve.rs | 2 ++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src-tauri/src/cmds.rs b/src-tauri/src/cmds.rs
index 348f19d4..e2582053 100644
--- a/src-tauri/src/cmds.rs
+++ b/src-tauri/src/cmds.rs
@@ -367,7 +367,7 @@ pub fn open_devtools(app_handle: tauri::AppHandle) {
 }
 
 #[tauri::command]
-pub async fn exit_app() {
+pub fn exit_app() {
     feat::quit(Some(0));
 }
 
diff --git a/src-tauri/src/feat.rs b/src-tauri/src/feat.rs
index 95634aef..f8dbdb36 100644
--- a/src-tauri/src/feat.rs
+++ b/src-tauri/src/feat.rs
@@ -120,11 +120,6 @@ pub fn quit(code: Option<i32>) {
     let app_handle = handle::Handle::global().app_handle().unwrap();
     handle::Handle::global().set_is_exiting();
     resolve::resolve_reset();
-    #[cfg(target_os = "macos")]
-    tauri::async_runtime::block_on(async {
-        resolve::restore_public_dns().await;
-    });
-
     log_err!(handle::Handle::global().get_window().unwrap().close());
     log_err!(app_handle.save_window_state(StateFlags::default()));
     app_handle.exit(code.unwrap_or(0));
diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs
index 2c69a567..f6a81a0d 100644
--- a/src-tauri/src/utils/resolve.rs
+++ b/src-tauri/src/utils/resolve.rs
@@ -114,6 +114,8 @@ pub fn resolve_reset() {
     tauri::async_runtime::block_on(async move {
         log_err!(sysopt::Sysopt::global().reset_sysproxy().await);
         log_err!(CoreManager::global().stop_core().await);
+        #[cfg(target_os = "macos")]
+        resolve::restore_public_dns().await;
     });
 }