From fa44c44379362c819cb7c5f3aa46be079f6f8751 Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.studio>
Date: Sun, 21 Aug 2022 17:44:13 -0300
Subject: [PATCH] fix(tauri-runtime-wry): trigger global tray event listeners

---
 core/tauri-runtime-wry/src/lib.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs
index eb58fbb1c..ca9564bbb 100644
--- a/core/tauri-runtime-wry/src/lib.rs
+++ b/core/tauri-runtime-wry/src/lib.rs
@@ -2628,12 +2628,12 @@ fn handle_event_loop<T: UserEvent>(
         for handler in handlers {
           handler(&event);
         }
+      }
 
-        let global_listeners = system_tray_manager.global_listeners.lock().unwrap();
-        let global_listeners_iter = global_listeners.iter();
-        for global_listener in global_listeners_iter {
-          global_listener(tray_id, &event);
-        }
+      let global_listeners = system_tray_manager.global_listeners.lock().unwrap();
+      let global_listeners_iter = global_listeners.iter();
+      for global_listener in global_listeners_iter {
+        global_listener(tray_id, &event);
       }
     }
     #[cfg(all(desktop, feature = "system-tray"))]
@@ -2662,6 +2662,12 @@ fn handle_event_loop<T: UserEvent>(
           handler(&event);
         }
       }
+
+      let global_listeners = system_tray_manager.global_listeners.lock().unwrap();
+      let global_listeners_iter = global_listeners.iter();
+      for global_listener in global_listeners_iter {
+        global_listener(id.0, &event);
+      }
     }
     Event::WindowEvent {
       event, window_id, ..