File tree Expand file tree Collapse file tree 3 files changed +165
-172
lines changed
Expand file tree Collapse file tree 3 files changed +165
-172
lines changed Original file line number Diff line number Diff line change 1+ ---
2+ " tauri " : " patch"
3+ ---
4+
5+ Fix a deadlock when modifying the menu in the ` on_menu_event ` closure.
Original file line number Diff line number Diff line change @@ -773,14 +773,13 @@ impl<R: Runtime> Window<R> {
773773 pub fn on_menu_event < F : Fn ( MenuEvent ) + Send + ' static > ( & self , f : F ) -> uuid:: Uuid {
774774 let menu_ids = self . window . menu_ids . clone ( ) ;
775775 self . window . dispatcher . on_menu_event ( move |event| {
776- f ( MenuEvent {
777- menu_item_id : menu_ids
778- . lock ( )
779- . unwrap ( )
780- . get ( & event. menu_item_id )
781- . unwrap ( )
782- . clone ( ) ,
783- } )
776+ let id = menu_ids
777+ . lock ( )
778+ . unwrap ( )
779+ . get ( & event. menu_item_id )
780+ . unwrap ( )
781+ . clone ( ) ;
782+ f ( MenuEvent { menu_item_id : id } )
784783 } )
785784 }
786785}
You can’t perform that action at this time.
0 commit comments