aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-18 14:01:30 +0000
committermarha <marha@users.sourceforge.net>2010-03-18 14:01:30 +0000
commitd792a6e870288fd8f0baf9943caf1628224b764c (patch)
tree84a7d544c1df15dffe7e18bf9cf0884250b831fc /xorg-server/Xi
parented47063ec4933a51ef0f2f7d667b8178a86b6b12 (diff)
parent1bee0ef6e6bd055ba9083c1b3863549b8a9093cc (diff)
downloadvcxsrv-d792a6e870288fd8f0baf9943caf1628224b764c.tar.gz
vcxsrv-d792a6e870288fd8f0baf9943caf1628224b764c.tar.bz2
vcxsrv-d792a6e870288fd8f0baf9943caf1628224b764c.zip
svn merge "^/branches/released" .1.7.99.902
increased version number
Diffstat (limited to 'xorg-server/Xi')
-rw-r--r--xorg-server/Xi/exevents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index a6e46a077..87c0c176b 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1053,7 +1053,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
break;
}
- if (DeviceEventCallback) {
+ if (DeviceEventCallback && !syncEvents.playingEvents) {
DeviceEventInfoRec eventinfo;
SpritePtr pSprite = device->spriteInfo->sprite;