[Xfce4-commits] [apps/xfce4-screensaver] 14/17: Do not try to lock already locked screen on idle

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 6ac43a3ce695102456fcd11d0335de5f9d94f22b
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Sat Feb 16 11:25:20 2019 -0400

    Do not try to lock already locked screen on idle
---
 src/gs-manager.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gs-manager.c b/src/gs-manager.c
index 0f8a5ac..a7cb27d 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -395,13 +395,13 @@ gs_manager_set_lock_active (GSManager *manager,
 
     g_return_if_fail (GS_IS_MANAGER (manager));
 
-    gs_debug ("Setting lock active: %d", lock_active);
 
     if (manager->priv->lock_active != lock_active) {
         manager->priv->lock_active = lock_active;
     }
 
     for (l = manager->priv->windows; l; l = l->next) {
+        gs_debug ("Setting lock active: %d", lock_active);
         gs_window_set_lock_active(l->data, lock_active);
     }
 }
@@ -571,6 +571,11 @@ add_lock_timer (GSManager *manager,
     if (!manager->priv->lock_with_saver_enabled)
         return;
 
+    gboolean locked;
+    gs_manager_get_lock_active (manager, &locked);
+    if (locked)
+        return;
+
     gs_debug ("Scheduling screen lock after screensaver is idling for %i sec", timeout / 1000);
     manager->priv->lock_timeout_id = g_timeout_add (timeout,
                                                     (GSourceFunc)activate_lock_timeout,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.