From 2397ec5937e594397e533925ccd257cae30b4cd1 Mon Sep 17 00:00:00 2001
From: Tony <68118705+Legend-Master@users.noreply.github.com>
Date: Mon, 4 Mar 2024 21:52:40 +0800
Subject: [PATCH] fix: single instance doesn't shutdown immediately (#1019)

* Fix single instance doesn't shutdown immediately

* Add change file
---
 .changes/fix-shutdown-timing.md                      | 5 +++++
 plugins/single-instance/src/platform_impl/linux.rs   | 3 ++-
 plugins/single-instance/src/platform_impl/windows.rs | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changes/fix-shutdown-timing.md

diff --git a/.changes/fix-shutdown-timing.md b/.changes/fix-shutdown-timing.md
new file mode 100644
index 00000000..568f5766
--- /dev/null
+++ b/.changes/fix-shutdown-timing.md
@@ -0,0 +1,5 @@
+---
+'single-instance': patch
+---
+
+Fix doesn't shutdown immediately.
diff --git a/plugins/single-instance/src/platform_impl/linux.rs b/plugins/single-instance/src/platform_impl/linux.rs
index c613a0d6..d900cf8b 100644
--- a/plugins/single-instance/src/platform_impl/linux.rs
+++ b/plugins/single-instance/src/platform_impl/linux.rs
@@ -70,7 +70,8 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
                             ),
                         );
                     }
-                    std::process::exit(0)
+                    app.cleanup_before_exit();
+                    std::process::exit(0);
                 }
                 _ => {}
             }
diff --git a/plugins/single-instance/src/platform_impl/windows.rs b/plugins/single-instance/src/platform_impl/windows.rs
index f66b2d1a..63be767d 100644
--- a/plugins/single-instance/src/platform_impl/windows.rs
+++ b/plugins/single-instance/src/platform_impl/windows.rs
@@ -62,7 +62,8 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
                             lpData: bytes.as_ptr() as _,
                         };
                         SendMessageW(hwnd, WM_COPYDATA, 0, &cds as *const _ as _);
-                        app.exit(0);
+                        app.cleanup_before_exit();
+                        std::process::exit(0);
                     }
                 }
             } else {