diff options
author | Andy Ritger <aritger@nvidia.com> | 2012-06-14 09:15:37 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2012-06-20 11:53:47 -0700 |
commit | dae317e7265007b38012244722e3b3a06e904ed5 (patch) | |
tree | a5546cac151c86e9ebec9ae5129689e91fbc8ffe /randr/randr.c | |
parent | 8dc70acbf3d82611ac9ec1ec2a52edcc01934850 (diff) |
randr: Don't recurse into mieqProcessInputEvents() from RRTellChanged().
Call UpdateCurrentTimeIf(), not UpdateCurrentTime(), from RRTellChanged().
The latter calls ProcessInputEvents(), which can trigger a recursion
into mieqProcessInputEvents(). The former omits the call to
ProcessInputEvents().
Signed-off-by: Andy Ritger <aritger@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'randr/randr.c')
-rw-r--r-- | randr/randr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/randr/randr.c b/randr/randr.c index a64aae366..4d4298af9 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -416,7 +416,7 @@ RRTellChanged(ScreenPtr pScreen) int i; if (pScrPriv->changed) { - UpdateCurrentTime(); + UpdateCurrentTimeIf(); if (pScrPriv->configChanged) { pScrPriv->lastConfigTime = currentTime; pScrPriv->configChanged = FALSE; |