CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-03 10:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Fix menu.remove trying to remove the item from itself instead of from the menu (#9225)

Browse Source 
follow up to https://github.com/tauri-apps/tauri/pull/9219/
This commit is contained in:
Fabian-Lars
2024-03-20 22:36:51 +01:00
committed by GitHub
parent edc9923c5b
commit ee028c414d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/tauri/src/menu/plugin.rs
View File

@@ -541,15 +541,16 @@ fn remove<R: Runtime>(
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::<Menu<R>>(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::<Submenu<R>>(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()),
};