enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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.
This commit is contained in:
Jean-Philippe Andre 2017-09-26 15:00:53 +09:00
parent 3d2551175d
commit 5258a6d46f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/elementary/efl_ui_win.c
View File

@ -2936,14 +2936,15 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
sd->wm_rot.rots = NULL;
/* Don't let callback in the air that point to sd */
ecore_evas_callback_delete_request_set(sd->ee, NULL);
ecore_evas_callback_resize_set(sd->ee, NULL);
ecore_evas_callback_mouse_in_set(sd->ee, NULL);
ecore_evas_callback_focus_in_set(sd->ee, NULL);
ecore_evas_callback_focus_out_set(sd->ee, NULL);
ecore_evas_callback_move_set(sd->ee, NULL);
ecore_evas_callback_state_change_set(sd->ee, NULL);
ecore_evas_callback_pre_render_set(sd->ee, NULL);
if (sd->ee)
{
ecore_evas_callback_mouse_in_set(sd->ee, NULL);
ecore_evas_callback_focus_in_set(sd->ee, NULL);
ecore_evas_callback_focus_out_set(sd->ee, NULL);
ecore_evas_callback_move_set(sd->ee, NULL);
ecore_evas_callback_state_change_set(sd->ee, NULL);
ecore_evas_callback_pre_render_set(sd->ee, NULL);
}
efl_canvas_group_del(efl_super(obj, MY_CLASS));