summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 15:00:53 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 17:58:07 +0900
commit5258a6d46f5c16423135514cab759ce1a4bfdc6b (patch)
tree12ac901b34c9a43b8fc6af3758a01be25632b595 /src/lib/elementary
parent3d2551175df2010032b512738f8346bd191d6587 (diff)
win: Avoid calling same function twice on shutdown
This avoids calling: ecore_evas_callback_delete_request_set ecore_evas_callback_resize_set twice when deleting a window. Also adds safety over sd->ee.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index b1f95a7161..604173dec8 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2936,14 +2936,15 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2936 sd->wm_rot.rots = NULL; 2936 sd->wm_rot.rots = NULL;
2937 2937
2938 /* Don't let callback in the air that point to sd */ 2938 /* Don't let callback in the air that point to sd */
2939 ecore_evas_callback_delete_request_set(sd->ee, NULL); 2939 if (sd->ee)
2940 ecore_evas_callback_resize_set(sd->ee, NULL); 2940 {
2941 ecore_evas_callback_mouse_in_set(sd->ee, NULL); 2941 ecore_evas_callback_mouse_in_set(sd->ee, NULL);
2942 ecore_evas_callback_focus_in_set(sd->ee, NULL); 2942 ecore_evas_callback_focus_in_set(sd->ee, NULL);
2943 ecore_evas_callback_focus_out_set(sd->ee, NULL); 2943 ecore_evas_callback_focus_out_set(sd->ee, NULL);
2944 ecore_evas_callback_move_set(sd->ee, NULL); 2944 ecore_evas_callback_move_set(sd->ee, NULL);
2945 ecore_evas_callback_state_change_set(sd->ee, NULL); 2945 ecore_evas_callback_state_change_set(sd->ee, NULL);
2946 ecore_evas_callback_pre_render_set(sd->ee, NULL); 2946 ecore_evas_callback_pre_render_set(sd->ee, NULL);
2947 }
2947 2948
2948 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 2949 efl_canvas_group_del(efl_super(obj, MY_CLASS));
2949 2950