From 34879f73446e218fd08d0d079c086fa556a08b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Didrik=20Nordstr=C3=B6m?= <didrik.nordstrom@gmail.com>
Date: Sun, 3 Jul 2022 17:33:08 -0700
Subject: [PATCH] fix: allow graceful shutdown of sidecar commands on exit
 (#4561)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
---
 .changes/fix-sidecar-shutdown.md | 5 +++++
 core/tauri/src/app.rs            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changes/fix-sidecar-shutdown.md

diff --git a/.changes/fix-sidecar-shutdown.md b/.changes/fix-sidecar-shutdown.md
new file mode 100644
index 000000000..329e141eb
--- /dev/null
+++ b/.changes/fix-sidecar-shutdown.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Emits RunEvent::Exit prior to killing child processes managed by Tauri, allowing graceful shutdown of sidecar binaries.
diff --git a/core/tauri/src/app.rs b/core/tauri/src/app.rs
index 6d20213fc..c274b848b 100644
--- a/core/tauri/src/app.rs
+++ b/core/tauri/src/app.rs
@@ -731,13 +731,13 @@ impl<R: Runtime> App<R> {
     let manager = self.manager.clone();
     self.runtime.take().unwrap().run(move |event| match event {
       RuntimeRunEvent::Exit => {
-        app_handle.cleanup_before_exit();
         on_event_loop_event(
           &app_handle,
           RuntimeRunEvent::Exit,
           &manager,
           Some(&mut callback),
         );
+        app_handle.cleanup_before_exit();
       }
       _ => {
         on_event_loop_event(&app_handle, event, &manager, Some(&mut callback));