From 063c3529a5c851a46e6b89cc5c2bee08cd3c8ea2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 16 Feb 2017 21:45:12 +0900 Subject: [PATCH] win: Avoid magic check failed in ecore with inline win Fixes T4663 --- src/lib/elementary/efl_ui_win.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 06d3bd501b..492bf8aad0 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2696,6 +2696,7 @@ _elm_win_on_img_obj_del(void *data, static void _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj) { + if (!imgobj) return; evas_object_event_callback_del_full (imgobj, EVAS_CALLBACK_DEL, _elm_win_on_img_obj_del, obj); evas_object_event_callback_del_full @@ -2771,7 +2772,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd) sd->pointer.surf = NULL; #endif - if (sd->img_obj) + if (sd->type == ELM_WIN_INLINED_IMAGE) { _elm_win_img_callbacks_del(obj, sd->img_obj); sd->img_obj = NULL;