diff options
| author | Andy Ritger <aritger@nvidia.com> | 2012-06-14 09:15:37 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-01 09:45:42 +1000 |
| commit | d21b6f0a2d767ca6fbd8f0ec387f83a50a38b486 (patch) | |
| tree | 045bcc33e9b9de2d99a77fb3ea0a7b0fe2c8babc | |
| parent | a6de3eac661ff6f23145cdaa49fc722381a1899e (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>
(cherry picked from commit dae317e7265007b38012244722e3b3a06e904ed5)
| -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 9f3df5fbe..5c1f70cb3 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; |