summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-10-16 09:21:47 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-10-18 16:43:00 +1000
commitb7c9bd9cf276e92a73be57ff2ed32b47a80f13fb (patch)
treeac45341b40f154e827f0b4e1db477266cde116e4 /Xext
parent2efe49c1029f959fe80879bcf50df42e8b80451d (diff)
sync: supply the counter from IdleTimeBlockHandler
The main idletime counter has an initialized deviceid, might as well be supplying it properly. Without this, we'd only ever check the XIAllDevices counter, so the wait would never be adjusted for the device-specific triggers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
-rw-r--r--Xext/sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/sync.c b/Xext/sync.c
index eaf063741..f8eb02a60 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -2624,7 +2624,7 @@ IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMa
return;
old_idle = counter->value;
- IdleTimeQueryValue(NULL, &idle);
+ IdleTimeQueryValue(counter, &idle);
counter->value = idle; /* push, so CheckTrigger works */
if (less && XSyncValueLessOrEqual(idle, *less)) {