hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1d08e8d30a7e2f7a217ffb5526f29db87127dc2e

commit 1d08e8d30a7e2f7a217ffb5526f29db87127dc2e
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Mon Sep 19 16:47:28 2016 +0900

    elm_menu: fix callback deletion from NULL object
    
    Reviewers: cedric, raster, Hermet
    
    Reviewed By: Hermet
    
    Subscribers: jpeg, reutskiy.v.v
    
    Differential Revision: https://phab.enlightenment.org/D4294
---
 src/lib/elementary/elm_menu.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 8ec5507..86822e3 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -701,10 +701,13 @@ _elm_menu_efl_canvas_group_group_del(Eo *obj, 
Elm_Menu_Data *sd)
 
    _elm_dbus_menu_unregister(obj);
 
-   evas_object_event_callback_del_full
-     (sd->parent, EVAS_CALLBACK_RESIZE, _parent_resize_cb, obj);
-   evas_object_event_callback_del_full
-     (sd->parent, EVAS_CALLBACK_DEL, _parent_del_cb, obj);
+   if (sd->parent)
+     {
+        evas_object_event_callback_del_full
+           (sd->parent, EVAS_CALLBACK_RESIZE, _parent_resize_cb, obj);
+        evas_object_event_callback_del_full
+           (sd->parent, EVAS_CALLBACK_DEL, _parent_del_cb, obj);
+     }
 
    EINA_LIST_FREE(sd->items, eo_item)
      _item_del(eo_item);

-- 


Reply via email to