[EGIT] [core/enlightenment] master 01/01: fix wl screensaver activation when deactivating during fade

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit 812ceafec6f080ef0d9f765b9ccac9c20930c643
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jul 27 17:32:11 2015 -0400

    fix wl screensaver activation when deactivating during fade
---
 src/bin/e_screensaver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index 634ff51..c80f7e3 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -537,13 +537,14 @@ E_API void
 e_screensaver_notidle(void)
 {
 #ifdef HAVE_WAYLAND
-   if (_e_screensaver_timer)
-     ecore_timer_reset(_e_screensaver_timer);
    if (e_screensaver_on_get())
      {
+        E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del);
         ecore_event_add(E_EVENT_SCREENSAVER_OFF_PRE, NULL, NULL, NULL);
         _e_screensaver_timer = ecore_timer_add(1.0, 
_e_screensaver_idle_timeout_cb, NULL);
      }
+   else if (_e_screensaver_timer)
+     ecore_timer_reset(_e_screensaver_timer);
 #endif
 }
 

--