aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-03-13 11:03:31 -0400
committerCedric BAIL <cedric@osg.samsung.com>2018-03-13 15:14:50 -0700
commit14bbae9b23efc69fe2c347d3848583ca5241fe9a (patch)
tree98d573c61491b922ebc16ab0b093f0a934ff9d76 /src/lib/elementary/efl_ui_win.c
parenttests: avoid test failures for elm_win when not running in X (diff)
downloadefl-14bbae9b23efc69fe2c347d3848583ca5241fe9a.tar.gz
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 <zmike@osg.samsung.com>
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c9
1 files 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);
}