aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/elementary/src/lib/elm_win.c
diff options
context:
space:
mode:
authorGwanglim Lee <gl77.lee@samsung.com>2014-08-07 10:19:24 -0400
committerChris Michael <cp.michael@samsung.com>2014-08-07 10:19:24 -0400
commitb79405e8d7cec24ab7a3f1496ede961117d0c923 (patch)
treef3458e16a0ef400ed0b238b7034467254a770173 /legacy/elementary/src/lib/elm_win.c
parentelementary: Handle case where ELM_ENGINE environment variable is (diff)
downloadefl-b79405e8d7cec24ab7a3f1496ede961117d0c923.tar.gz
win: Don't call ecore_x_screensaver APIs if elm win doesn't have X11 window
Summary: Elementary application crashes on startup when it is running with wayland engine. This crash problem happens while ecore_x_screensaver API is being called from _win_noblank_eval funcion. Thus we should not call ecore_x_screensaver APIs if elm win doesn't have X11 window. Test Plan: 1. build efl and elementary to support x11 and also wayland 1. run weston without xwayland 2. run elementary_test on the weston Reviewers: raster, seoz, stefan_schmidt, devilhorns Differential Revision: https://phab.enlightenment.org/D1293
Diffstat (limited to 'legacy/elementary/src/lib/elm_win.c')
-rw-r--r--legacy/elementary/src/lib/elm_win.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 68f53651db..2ffef6948a 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -319,6 +319,7 @@ _win_noblank_eval(void)
Eina_List *l;
Evas_Object *obj;
int noblanks = 0;
+ Eina_Bool change = EINA_FALSE;
#ifdef HAVE_ELEMENTARY_X
EINA_LIST_FOREACH(_elm_win_list, l, obj)
@@ -329,10 +330,14 @@ _win_noblank_eval(void)
{
if ((sd->noblank) && (!sd->iconified) && (!sd->withdrawn) &&
evas_object_visible_get(obj))
- noblanks++;
+ noblanks++;
+
+ change = EINA_TRUE;
}
}
+ if (!change) return;
+
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
ENGINE_COMPARE(ELM_XRENDER_X11) || ENGINE_COMPARE(ELM_OPENGL_X11) ||