[mutter/wayland] idle-monitor: avoid XSyncBadAlarm X error



commit d043d9943bb8656d855b80f60ec883606e4c0358
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Feb 14 10:10:20 2014 -0500

    idle-monitor: avoid XSyncBadAlarm X error
    
    If we fail to find the IDLETIME counter, then the alarm variable will be
    uninitialised.  Most code paths are careful to check this before
    submitting XSync calls, but there is one check missing.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724364

 src/core/meta-idle-monitor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/core/meta-idle-monitor.c b/src/core/meta-idle-monitor.c
index 7712cc7..c99fc10 100644
--- a/src/core/meta-idle-monitor.c
+++ b/src/core/meta-idle-monitor.c
@@ -535,7 +535,7 @@ make_watch (MetaIdleMonitor           *monitor,
           watch->timeout_source = source;
         }
     }
-  else
+  else if (monitor->user_active_alarm != None)
     {
       if (timeout_msec != 0)
         {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]