summaryrefslogtreecommitdiff
authorPeter Hutterer <peter.hutterer@who-t.net>2008-12-23 00:00:34 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2009-01-05 01:05:13 (GMT)
commite1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a (patch) (side-by-side diff)
tree4bd275992fc2024b87254ea400d4eef9209e4a7b
parentaf820259a06a6e8dbd299fe22347aa83b0c985b0 (diff)
downloadxserver-e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a.zip
xserver-e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a.tar.gz
xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/common/xf86Xinput.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index fe62772..e39c087 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -549,10 +549,11 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL enable)
ActivateDevice(dev);
/* Enable it if it's properly initialised and we're currently in the VT */
if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
+ {
EnableDevice(dev);
-
- /* send enter/leave event, update sprite window */
- CheckMotion(NULL, dev);
+ /* send enter/leave event, update sprite window */
+ CheckMotion(NULL, dev);
+ }
*pdev = dev;
return Success;