discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=be69ae562fb164f1b9c683dd2f3f0f8763bd29b7

commit be69ae562fb164f1b9c683dd2f3f0f8763bd29b7
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Nov 23 14:46:32 2015 -0500

    only create wayland screensaver timer in wayland mode
    
    probably fix T2867
---
 src/bin/e_screensaver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index cedfcae..41b10b6 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -287,7 +287,7 @@ _e_screensaver_handler_screensaver_off_cb(void *data 
EINA_UNUSED, int type EINA_
    else if (_e_screensaver_ask_presentation_count)
      _e_screensaver_ask_presentation_count = 0;
 #ifdef HAVE_WAYLAND
-   if (_e_screensaver_timeout)
+   if (_e_screensaver_timeout && (e_comp->comp_type == E_PIXMAP_TYPE_WL))
      _e_screensaver_timer = ecore_timer_add(_e_screensaver_timeout, 
_e_screensaver_idle_timeout_cb, (void*)1);
 #endif
    return ECORE_CALLBACK_PASS_ON;

-- 


Reply via email to