cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=14bbae9b23efc69fe2c347d3848583ca5241fe9a
commit 14bbae9b23efc69fe2c347d3848583ca5241fe9a Author: Cedric BAIL <ced...@osg.samsung.com> Date: Tue Mar 13 11:03:31 2018 -0400 efl_ui_win: do not trigger elm quit policy twice for same win only check each policy for the case which should trigger it to avoid borking main loop Signed-off-by: Mike Blumenkrantz <zm...@osg.samsung.com> --- src/lib/elementary/efl_ui_win.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 39c4066aae..cb7c6b02be 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -584,12 +584,6 @@ _elm_win_state_eval(void *data EINA_UNUSED) static Eina_Bool _elm_win_policy_quit_triggered(Eo* triggering_obj) { - if ((!_elm_win_list) && - (elm_policy_get(ELM_POLICY_QUIT) == ELM_POLICY_QUIT_LAST_WINDOW_CLOSED)) - { - return EINA_TRUE; - } - if (elm_policy_get(ELM_POLICY_QUIT) == ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN) { Eina_List *l; @@ -2915,7 +2909,8 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd) efl_canvas_group_del(efl_super(obj, MY_CLASS)); - if (_elm_win_policy_quit_triggered(obj)) + if ((!_elm_win_list) && + (elm_policy_get(ELM_POLICY_QUIT) == ELM_POLICY_QUIT_LAST_WINDOW_CLOSED)) { _elm_win_flush_cache_and_exit(obj); } --