cleanup on close

Author: lucasfernog

crates/tauri/src/tray/mod.rs

@@ -598,6 +598,13 @@ impl<R: Runtime> TrayIcon<R> {
 
 impl<R: Runtime> Resource for TrayIcon<R> {
   fn close(self: std::sync::Arc<Self>) {
+    self
+      .app_handle
+      .state::<plugin::TrayIcons>()
+      .icons
+      .lock()
+      .unwrap()
+      .remove(&self.id.0);
     self.app_handle.remove_tray_by_id(&self.id);
   }
 }

crates/tauri/src/tray/plugin.rs

@@ -19,8 +19,8 @@ use crate::{
 
 use super::{TrayIcon, TrayIconEvent};
 
-struct TrayIcons {
-  icons: Mutex<HashMap<String, ResourceId>>,
+pub(crate) struct TrayIcons {
+  pub(crate) icons: Mutex<HashMap<String, ResourceId>>,
 }
 
 #[derive(Deserialize)]