xserver: Branch 'master'

[Keith Packard]

 os/WaitFor.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9ed5b263542e5245317927828f0515db6c0a54c8
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 28 08:04:43 2016 -0700

    os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)
    
    If a work proc wakes up a sleeping client and it is ready to execute,
    we need to re-compute the local 'are_ready' value before deciding
    what timeout value to use in WaitForSomething.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98030
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 7d5aa32..ff1c85e 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -204,8 +204,10 @@ WaitForSomething(Bool are_ready)
        crashed connections and the screen saver timeout */
     while (1) {
         /* deal with any blocked jobs */
-        if (workQueue)
+        if (workQueue) {
             ProcessWorkQueue();
+            are_ready = clients_are_ready();
+        }
 
         if (are_ready)
             timeout = 0;