Skip to content

Commit 9c82006

Browse files
authored
fix(core): deadlock when creating window from menu handler, closes #3110 (#3126)
1 parent 3206a70 commit 9c82006

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"tauri-runtime-wry": patch
3+
"tauri": patch
4+
---
5+
6+
Fixes a deadlock when creating a window from a menu event handler.
7+

core/tauri-runtime-wry/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,8 +2279,10 @@ fn handle_event_loop(
22792279
let event = MenuEvent {
22802280
menu_item_id: menu_id.0,
22812281
};
2282-
let listeners = menu_event_listeners.lock().unwrap();
2283-
let window_menu_event_listeners = listeners.get(&window_id).cloned().unwrap_or_default();
2282+
let window_menu_event_listeners = {
2283+
let listeners = menu_event_listeners.lock().unwrap();
2284+
listeners.get(&window_id).cloned().unwrap_or_default()
2285+
};
22842286
for handler in window_menu_event_listeners.lock().unwrap().values() {
22852287
handler(&event);
22862288
}

0 commit comments

Comments
 (0)