diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-09 16:54:56 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-09 16:54:56 +0000 |
| commit | f93c38fd889ba3a345daf41a5c8b472433e007b9 (patch) | |
| tree | 33d4f04e0d4192cddf638923f907b1d3031d48a6 /render/animcur.c | |
| parent | 5df71d7065365c8314a3f45741ebbb4bbf9811dc (diff) | |
| parent | eec5eb2f09682718e69f42491181ade0b093f52d (diff) | |
Merge tag 'xorg-server-1.13.3' into cygwin-release-1.13xserver-cygwin-1.13.3-1
xorg-server-1.13.3
Diffstat (limited to 'render/animcur.c')
| -rw-r--r-- | render/animcur.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/render/animcur.c b/render/animcur.c index ebc5b8ef7..9cbba83fa 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -143,6 +143,8 @@ AnimCurScreenBlockHandler(ScreenPtr pScreen, Bool activeDevice = FALSE; CARD32 now = 0, soonest = ~0; /* earliest time to wakeup again */ + Unwrap(as, pScreen, BlockHandler); + for (dev = inputInfo.devices; dev; dev = dev->next) { if (IsPointerDevice(dev) && pScreen == dev->spriteInfo->anim.pScreen) { if (!activeDevice) { @@ -180,7 +182,6 @@ AnimCurScreenBlockHandler(ScreenPtr pScreen, if (activeDevice) AdjustWaitForDelay(pTimeout, soonest - now); - Unwrap(as, pScreen, BlockHandler); (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); if (activeDevice) Wrap(as, pScreen, BlockHandler, AnimCurScreenBlockHandler); |