From ee028c414d10824cccd5671327e6ff5d55c05e92 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Wed, 20 Mar 2024 22:36:51 +0100 Subject: [PATCH] fix(core): Fix menu.remove trying to remove the item from itself instead of from the menu (#9225) follow up to https://github.com/tauri-apps/tauri/pull/9219/ --- core/tauri/src/menu/plugin.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/tauri/src/menu/plugin.rs b/core/tauri/src/menu/plugin.rs index b57760107..eee93de87 100644 --- a/core/tauri/src/menu/plugin.rs +++ b/core/tauri/src/menu/plugin.rs @@ -541,15 +541,16 @@ fn remove( item: (ResourceId, ItemKind), ) -> crate::Result<()> { let resources_table = app.resources_table(); - let (rid, kind) = item; + let (item_rid, item_kind) = item; match kind { ItemKind::Menu => { let menu = resources_table.get::>(rid)?; - do_menu_item!(resources_table, rid, kind, |i| menu.remove(&*i))?; + do_menu_item!(resources_table, item_rid, item_kind, |i| menu.remove(&*i))?; } ItemKind::Submenu => { let submenu = resources_table.get::>(rid)?; - do_menu_item!(resources_table, rid, kind, |i| submenu.remove(&*i))?; + do_menu_item!(resources_table, item_rid, item_kind, |i| submenu + .remove(&*i))?; } _ => return Err(anyhow::anyhow!("unexpected menu item kind").into()), };