From 0bad3aca9608df04656757064fe85d757ff17513 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.app>
Date: Thu, 3 Aug 2023 06:32:43 -0700
Subject: [PATCH] fix(macos): manually retain/release NSMenu reference (#84)

* fix(macos): manually retain/release NSMenu reference

* Update src/platform_impl/macos/mod.rs

* retain submenu nsmenu

* remove unused
---
 .changes/retain-ns-menu.md     |  5 +++++
 src/platform_impl/macos/mod.rs | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 .changes/retain-ns-menu.md

diff --git a/.changes/retain-ns-menu.md b/.changes/retain-ns-menu.md
new file mode 100644
index 0000000..739e63f
--- /dev/null
+++ b/.changes/retain-ns-menu.md
@@ -0,0 +1,5 @@
+---
+"muda": patch
+---
+
+Manually retain/release NSMenu reference.
diff --git a/src/platform_impl/macos/mod.rs b/src/platform_impl/macos/mod.rs
index 084926d..a968690 100644
--- a/src/platform_impl/macos/mod.rs
+++ b/src/platform_impl/macos/mod.rs
@@ -47,20 +47,29 @@ extern "C" {
 #[allow(non_upper_case_globals)]
 const NSAboutPanelOptionCopyright: &str = "Copyright";
 
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct Menu {
     id: u32,
     ns_menu: id,
     children: Rc<RefCell<Vec<Rc<RefCell<MenuChild>>>>>,
 }
 
+impl Drop for Menu {
+    fn drop(&mut self) {
+        unsafe {
+            let _: () = msg_send![self.ns_menu, release];
+        }
+    }
+}
+
 impl Menu {
     pub fn new() -> Self {
         Self {
             id: COUNTER.next(),
             ns_menu: unsafe {
-                let ns_menu = NSMenu::alloc(nil).autorelease();
+                let ns_menu = NSMenu::new(nil);
                 ns_menu.setAutoenablesItems(NO);
+                let _: () = msg_send![ns_menu, retain];
                 ns_menu
             },
             children: Rc::new(RefCell::new(Vec::new())),
@@ -173,7 +182,18 @@ pub struct MenuChild {
     // submenu fields
     pub children: Option<Vec<Rc<RefCell<MenuChild>>>>,
     ns_menus: HashMap<u32, Vec<id>>,
-    ns_menu: (u32, id),
+    ns_menu: NsMenuRef,
+}
+
+#[derive(Debug)]
+struct NsMenuRef(u32, id);
+
+impl Drop for NsMenuRef {
+    fn drop(&mut self) {
+        unsafe {
+            let _: () = msg_send![self.1, release];
+        }
+    }
 }
 
 impl Default for MenuChild {
@@ -191,7 +211,7 @@ impl Default for MenuChild {
             native_icon: Default::default(),
             children: Default::default(),
             ns_menus: Default::default(),
-            ns_menu: (0, 0 as _),
+            ns_menu: NsMenuRef(0, 0 as _),
         }
     }
 }
@@ -215,7 +235,11 @@ impl MenuChild {
             text: strip_mnemonic(text),
             enabled,
             children: Some(Vec::new()),
-            ns_menu: (COUNTER.next(), unsafe { NSMenu::alloc(nil).autorelease() }),
+            ns_menu: NsMenuRef(COUNTER.next(), unsafe {
+                let menu = NSMenu::new(nil);
+                let _: () = msg_send![menu, retain];
+                menu
+            }),
             ..Default::default()
         }
     }