From 3c4ee7c997fa3ff696bcfd5b8c82fecaca16bf49 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.studio>
Date: Sun, 27 Mar 2022 16:22:34 -0700
Subject: [PATCH] refactor(wry): emit `RunEvent::Exit` on
 `Event::LoopDestroyed` (#3785)

---
 .changes/exit-loop-destroyed.md   |  5 +++++
 core/tauri-runtime-wry/src/lib.rs | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .changes/exit-loop-destroyed.md

diff --git a/.changes/exit-loop-destroyed.md b/.changes/exit-loop-destroyed.md
new file mode 100644
index 000000000..df1b506e8
--- /dev/null
+++ b/.changes/exit-loop-destroyed.md
@@ -0,0 +1,5 @@
+---
+"tauri-runtime-wry": patch
+---
+
+Emit `RunEvent::Exit` on `tao::event::Event::LoopDestroyed` instead of after `RunEvent::ExitRequested`.
diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs
index e14c9b19d..0e146d198 100644
--- a/core/tauri-runtime-wry/src/lib.rs
+++ b/core/tauri-runtime-wry/src/lib.rs
@@ -2300,14 +2300,10 @@ fn handle_event_loop<T: UserEvent>(
     #[cfg(feature = "system-tray")]
     tray_context,
   } = context;
-  if *control_flow == ControlFlow::Exit {
-    return RunIteration {
-      window_count: windows.lock().expect("poisoned webview collection").len(),
-    };
+  if *control_flow != ControlFlow::Exit {
+    *control_flow = ControlFlow::Wait;
   }
 
-  *control_flow = ControlFlow::Wait;
-
   match event {
     Event::NewEvents(StartCause::Init) => {
       callback(RunEvent::Ready);
@@ -2321,6 +2317,10 @@ fn handle_event_loop<T: UserEvent>(
       callback(RunEvent::MainEventsCleared);
     }
 
+    Event::LoopDestroyed => {
+      callback(RunEvent::Exit);
+    }
+
     Event::GlobalShortcutEvent(accelerator_id) => {
       for (id, handler) in &*global_shortcut_manager_handle.listeners.lock().unwrap() {
         if accelerator_id == *id {
@@ -2565,7 +2565,6 @@ fn on_window_close<'a, T: UserEvent>(
 
       if !should_prevent {
         *control_flow = ControlFlow::Exit;
-        callback(RunEvent::Exit);
       }
     }
     Some(webview)