Improve cleanup of menu and tray icon references on macOS

Author: lijy91

src/platform/macos/menu_macos.mm

@@ -164,6 +164,11 @@ - (void)menuDidClose:(NSMenu *)menu {
     }
 
     ~Impl() {
+        // First, clean up submenu reference
+        if (submenu_) {
+            submenu_.reset();
+        }
+        
         if (target_) {
             // Remove target and action to prevent callbacks after destruction
             [ns_menu_item_ setTarget:nil];
@@ -221,8 +226,11 @@ - (void)menuDidClose:(NSMenu *)menu {
 }
 
 MenuItem::~MenuItem() {
-    // Unregister from event registry
-    g_menu_item_registry.erase(id);
+    // Safely remove from global registry
+    auto it = g_menu_item_registry.find(id);
+    if (it != g_menu_item_registry.end()) {
+        g_menu_item_registry.erase(it);
+    }
 }
 
 MenuItemType MenuItem::GetType() const {
@@ -445,6 +453,9 @@ - (void)menuDidClose:(NSMenu *)menu {
     }
 
     ~Impl() {
+        // First, clear all menu item references
+        items_.clear();
+        
         if (delegate_) {
             // Remove delegate to prevent callbacks after destruction
             [ns_menu_ setDelegate:nil];
@@ -480,8 +491,11 @@ - (void)menuDidClose:(NSMenu *)menu {
 }
 
 Menu::~Menu() {
-    // Unregister from event registry
-    g_menu_registry.erase(id);
+    // Safely remove from global registry
+    auto it = g_menu_registry.find(id);
+    if (it != g_menu_registry.end()) {
+        g_menu_registry.erase(it);
+    }
 }
 
 void Menu::AddItem(std::shared_ptr<MenuItem> item) {

src/platform/macos/tray_icon_macos.mm

@@ -39,6 +39,11 @@ - (void)statusItemRightClicked:(id)sender;
   }
 
   ~Impl() {
+    // First, safely clean up context_menu_
+    if (context_menu_) {
+      context_menu_.reset();  // Explicitly reset shared_ptr
+    }
+    
     if (ns_status_item_) {
       // Remove target and action to prevent callbacks after destruction
       if (ns_status_item_.button) {
@@ -156,6 +161,14 @@ - (void)statusItemRightClicked:(id)sender;
 }
 
 void TrayIcon::SetContextMenu(std::shared_ptr<Menu> menu) {
+  // First, clean up old menu reference
+  if (pimpl_->context_menu_) {
+    if (pimpl_->ns_status_item_) {
+      [pimpl_->ns_status_item_ setMenu:nil];
+    }
+    pimpl_->context_menu_.reset();
+  }
+  
   pimpl_->context_menu_ = menu;
 
   // Set the menu as the status item's menu for right-click
@@ -165,9 +178,6 @@ - (void)statusItemRightClicked:(id)sender;
     if (nsMenu) {
       [pimpl_->ns_status_item_ setMenu:nsMenu];
     }
-  } else if (pimpl_->ns_status_item_) {
-    // Remove the menu if null is passed
-    [pimpl_->ns_status_item_ setMenu:nil];
   }
 }
 

src/platform/macos/tray_manager_macos.mm

@@ -22,13 +22,17 @@
 
 TrayManager::~TrayManager() {
   std::lock_guard<std::mutex> lock(mutex_);
-  // Clean up all managed tray icons
+  
+  // First, clean up all tray icon menu references to prevent circular references
   for (auto& pair : trays_) {
     auto tray = pair.second;
     if (tray) {
-      // The TrayIcon destructor will handle cleanup of the NSStatusItem
+      // Explicitly clear menu references
+      tray->SetContextMenu(nullptr);
     }
   }
+  
+  // Then clear the container
   trays_.clear();
 }