CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-03 10:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): deadlock when closing the app on a tray event handler (#3771)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2022-03-25 09:17:32 -07:00
committed by GitHub
parent def8a62bd3
commit 9489963e00
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/tauri-runtime-wry/src/lib.rs
View File

@@ -1832,7 +1832,7 @@ impl<T: UserEvent> Runtime<T> for Wry<T> {
.listeners
.lock()
.unwrap()
.insert(id, Box::new(f));
.insert(id, Arc::new(Box::new(f)));
id
}
@@ -2355,7 +2355,8 @@ fn handle_event_loop<T: UserEvent>(
..
} => {
let event = SystemTrayEvent::MenuItemClick(menu_id.0);
for handler in tray_context.listeners.lock().unwrap().values() {
let listeners = tray_context.listeners.lock().unwrap().clone();
for handler in listeners.values() {
handler(&event);
}
}

2
core/tauri-runtime-wry/src/system_tray.rs
View File

@@ -32,7 +32,7 @@ use std::{
};
pub type SystemTrayEventHandler = Box<dyn Fn(&SystemTrayEvent) + Send>;
pub type SystemTrayEventListeners = Arc<Mutex<HashMap<Uuid, SystemTrayEventHandler>>>;
pub type SystemTrayEventListeners = Arc<Mutex<HashMap<Uuid, Arc<SystemTrayEventHandler>>>>;
pub type SystemTrayItems = Arc<Mutex<HashMap<u16, WryCustomMenuItem>>>;
#[derive(Debug, Clone)]