Applied all debian/patches from glsdk-6_00_00_07 release

[glsdk/xserver.git] / dix / dispatch.c

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 8f910f4a93ad1e0d7087993bb8af4a850916e1e4..5a0aa31160f4804a1d713469daede9de83cf55ff 100644 (file)
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -215,7 +215,7 @@ UpdateCurrentTimeIf(void)
     systime.milliseconds = GetTimeInMillis();
     if (systime.milliseconds < currentTime.milliseconds)
        systime.months++;
-    if (*checkForInput[0] == *checkForInput[1])
+    if (CompareTimeStamps(systime, currentTime) == LATER)
        currentTime = systime;
 }
 
@@ -408,6 +408,9 @@ Dispatch(void)
                }
                /* now, finally, deal with client requests */
 
+                /* Update currentTime so request time checks, such as for input
+                 * device grabs, are calculated correctly */
+                UpdateCurrentTimeIf();
                result = ReadRequestFromClient(client);
                if (result <= 0) 
                {