win: Avoid magic check failed in ecore with inline win

Fixes T4663
This commit is contained in:
Jean-Philippe Andre 2017-02-16 21:45:12 +09:00
parent e99f6a87ee
commit 063c3529a5
1 changed files with 2 additions and 1 deletions

View File

@ -2696,6 +2696,7 @@ _elm_win_on_img_obj_del(void *data,
static void static void
_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj) _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj)
{ {
if (!imgobj) return;
evas_object_event_callback_del_full evas_object_event_callback_del_full
(imgobj, EVAS_CALLBACK_DEL, _elm_win_on_img_obj_del, obj); (imgobj, EVAS_CALLBACK_DEL, _elm_win_on_img_obj_del, obj);
evas_object_event_callback_del_full 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; sd->pointer.surf = NULL;
#endif #endif
if (sd->img_obj) if (sd->type == ELM_WIN_INLINED_IMAGE)
{ {
_elm_win_img_callbacks_del(obj, sd->img_obj); _elm_win_img_callbacks_del(obj, sd->img_obj);
sd->img_obj = NULL; sd->img_obj = NULL;