From fd0f6557edd7d74f474bcba3f2629f840d31852a Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 11 Feb 2013 08:35:28 +0000 Subject: [PATCH] fix crash when activating menu from start gadget after locking screen from start gadget menu ticket #cedric SVN revision: 83811 --- ChangeLog | 1 + NEWS | 1 + src/bin/e_menu.c | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e5d11ac15..2853a9604 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2013-02-11 Mike Blumenkrantz * fixed bug where pointer warping to new clients would start at a random location + * fix crash when locking screen from Start gadget and then activating gadget again 2013-02-08 Cedric Bail diff --git a/NEWS b/NEWS index 131230c84..0c820c23e 100644 --- a/NEWS +++ b/NEWS @@ -169,3 +169,4 @@ Fixes: * keyboard mapping change now also disables for window class "vmware" * don't call efreet_menu_parse from a thread * fixed bug where pointer warping to new clients would start at a random location + * fix crash when locking screen from Start gadget and then activating gadget again diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 9dbdccf9c..167521afe 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1379,7 +1379,10 @@ _e_menu_cb_intercept_item_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Co evas_object_move(mi->event_object, x, y); evas_object_move(o, x, y); if ((mi->submenu) && (mi->submenu->parent_item)) - _e_menu_reposition(mi->submenu); + { + mi->submenu->zone = mi->menu->zone; + _e_menu_reposition(mi->submenu); + } } static void