summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-07-24 13:50:39 -0400
committerChris Michael <cp.michael@samsung.com>2014-07-24 14:09:06 -0400
commitc8d2086175383b4c1103ef307d1ee85a26d547b0 (patch)
treec92c5f44e230858c0317c88a096a2d1ca19f8ee8
parent8425af77686bace152e93d89d3ed5b872cd0b32e (diff)
elementary: Fix segfault when running elm apps under wayland
Don't call ecore_x functions unless we are running under an X11-compatible engine, else we get segfaults in elm_apps. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elm_win.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 28c3e77dc..abcf482db 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -328,8 +328,15 @@ _win_noblank_eval(void)
328 noblanks++; 328 noblanks++;
329 } 329 }
330 } 330 }
331 if (noblanks > 0) ecore_x_screensaver_supend(); 331
332 else ecore_x_screensaver_resume(); 332 if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
333 ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
334 ENGINE_COMPARE(ELM_XRENDER_X11) || ENGINE_COMPARE(ELM_OPENGL_X11) ||
335 ENGINE_COMPARE(ELM_OPENGL_COCOA) || ENGINE_COMPARE(ELM_SOFTWARE_WIN32))
336 {
337 if (noblanks > 0) ecore_x_screensaver_supend();
338 else ecore_x_screensaver_resume();
339 }
333#endif 340#endif
334#ifdef HAVE_ELEMENTARY_WAYLAND 341#ifdef HAVE_ELEMENTARY_WAYLAND
335 // XXX: no wl implementation of this yet - maybe higher up at prop level 342 // XXX: no wl implementation of this yet - maybe higher up at prop level