fix wl screensaver activation when deactivating during fade

This commit is contained in:
Mike Blumenkrantz 2015-07-27 17:32:11 -04:00
parent 376945dcd8
commit 812ceafec6
1 changed files with 3 additions and 2 deletions

View File

@ -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
}