win: Avoid magic check failed in ecore with inline win
authorJean-Philippe Andre <jp.andre@samsung.com>
Thu, 16 Feb 2017 12:45:12 +0000 (21:45 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Thu, 16 Feb 2017 12:45:12 +0000 (21:45 +0900)
Fixes T4663

src/lib/elementary/efl_ui_win.c

index 06d3bd5..492bf8a 100644 (file)
@@ -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;