summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-02-16 21:45:12 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-02-16 21:45:12 +0900
commit063c3529a5c851a46e6b89cc5c2bee08cd3c8ea2 (patch)
tree4ee0f44baae367c5dbec43745a41eebb1a0c2560 /src/lib/elementary
parente99f6a87eec60f7ee4ca526520b2493892e1d97f (diff)
win: Avoid magic check failed in ecore with inline win
Fixes T4663
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c3
1 files changed, 2 insertions, 1 deletions
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,
2696static void 2696static void
2697_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj) 2697_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj)
2698{ 2698{
2699 if (!imgobj) return;
2699 evas_object_event_callback_del_full 2700 evas_object_event_callback_del_full
2700 (imgobj, EVAS_CALLBACK_DEL, _elm_win_on_img_obj_del, obj); 2701 (imgobj, EVAS_CALLBACK_DEL, _elm_win_on_img_obj_del, obj);
2701 evas_object_event_callback_del_full 2702 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)
2771 sd->pointer.surf = NULL; 2772 sd->pointer.surf = NULL;
2772#endif 2773#endif
2773 2774
2774 if (sd->img_obj) 2775 if (sd->type == ELM_WIN_INLINED_IMAGE)
2775 { 2776 {
2776 _elm_win_img_callbacks_del(obj, sd->img_obj); 2777 _elm_win_img_callbacks_del(obj, sd->img_obj);
2777 sd->img_obj = NULL; 2778 sd->img_obj = NULL;