summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-06-09 14:29:25 +0900
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-07-31 16:18:00 -0400
commit4a48aa32d5397f38e806329f15265bb926531014 (patch)
treed6f9013dbd83d64fa31b73fe53556029f2dc671a
parent40caec09e90148b1bde133f3330acea3b8e2b55f (diff)
e - shelf menu - handle deletion properly if cb is not for shelf menu
it seems that some changes now make the shel menu post callback be called for older menus not part of the shelf and thus shelf menu stored != menu the cb is for - thus resulting in deletion of the wrong menu
-rw-r--r--src/bin/e_shelf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 9b2fbeab1..4c63e0272 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1615,13 +1615,13 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS
1615} 1615}
1616 1616
1617static void 1617static void
1618_e_shelf_cb_menu_post(void *data, E_Menu *m __UNUSED__) 1618_e_shelf_cb_menu_post(void *data, E_Menu *m)
1619{ 1619{
1620 E_Shelf *es; 1620 E_Shelf *es;
1621 1621
1622 es = data; 1622 es = data;
1623 if (!es->menu) return; 1623 e_object_del(E_OBJECT(m));
1624 e_object_del(E_OBJECT(es->menu)); 1624 if (m != es->menu) return;
1625 es->menu = NULL; 1625 es->menu = NULL;
1626} 1626}
1627 1627