enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

e menus - dont double unref/free a menu 

e_menu_item_submenu_set() already unrefs the previous submenu...
This commit is contained in:
Carsten Haitzler 2020-05-11 11:14:53 +01:00
parent a310999640
commit 306632a21c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_menu.c
View File

@ -771,6 +771,7 @@ e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub)
E_OBJECT_CHECK(mi);
E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
if (mi->submenu == sub) return;
tmp = _e_active_menus_copy_ref();
submenu = !!mi->submenu;
if (mi->submenu) e_object_unref(E_OBJECT(mi->submenu));
@ -3034,13 +3035,8 @@ _e_menu_cb_scroll_animator(void *data EINA_UNUSED)
static void
_e_menu_cb_item_submenu_post_default(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi)
{
E_Menu *subm;
if (!mi->submenu) return;
subm = mi->submenu;
e_menu_item_submenu_set(mi, NULL);
e_object_del(E_OBJECT(subm));
e_menu_item_submenu_set(mi, NULL); // unis unrefs previous submenu
}
static void