fix(macos): crash on removing menu item (#176)

tauri-apps · Apr 1, 2024 · 2edfbf1 · 2edfbf1
1 parent 6454ea2
commit 2edfbf1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.changes/fix-macos-crash-on-remove.md b/.changes/fix-macos-crash-on-remove.md
@@ -0,0 +1,5 @@
+---
+"muda": patch
+---
+
+On macOS, fix a crash when removing a menu item.
diff --git a/src/platform_impl/macos/mod.rs b/src/platform_impl/macos/mod.rs
@@ -539,8 +539,7 @@ impl MenuChild {
                 AddOp::Append => {
                     for menus in self.ns_menus.as_ref().unwrap().values() {
                         for ns_menu in menus {
-                            let ns_menu_item: id =
-                                item.make_ns_item_for_menu(self.ns_menu.as_ref().unwrap().0)?;
+                            let ns_menu_item: id = item.make_ns_item_for_menu(ns_menu.0)?;
                             ns_menu.1.addItem_(ns_menu_item);
                         }
                     }
@@ -554,8 +553,7 @@ impl MenuChild {
                 AddOp::Insert(position) => {
                     for menus in self.ns_menus.as_ref().unwrap().values() {
                         for ns_menu in menus {
-                            let ns_menu_item: id =
-                                item.make_ns_item_for_menu(self.ns_menu.as_ref().unwrap().0)?;
+                            let ns_menu_item: id = item.make_ns_item_for_menu(ns_menu.0)?;
                             let () = msg_send![ns_menu.1, insertItem: ns_menu_item atIndex: position as NSInteger];
                         }
                     }