aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-14 09:21:40 +0000
committermarha <marha@users.sourceforge.net>2011-03-14 09:21:40 +0000
commitcebd8c3e6e23d15e05c37549231e04e15c99d8c1 (patch)
tree686f46c9a096b9a59da1390404aaee532bb03612 /xorg-server
parent6a16283d10f9d0ade43528b537c8ac68ad571bc1 (diff)
downloadvcxsrv-cebd8c3e6e23d15e05c37549231e04e15c99d8c1.tar.gz
vcxsrv-cebd8c3e6e23d15e05c37549231e04e15c99d8c1.tar.bz2
vcxsrv-cebd8c3e6e23d15e05c37549231e04e15c99d8c1.zip
Synchronised again with released version
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkb/xkbActions.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c
index c9649115e..a40e2ae79 100644
--- a/xorg-server/xkb/xkbActions.c
+++ b/xorg-server/xkb/xkbActions.c
@@ -958,15 +958,15 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi,
DeviceIntPtr dev;
int button;
+ if (xkbi->device == inputInfo.keyboard)
+ return 0;
+
if (filter->keycode==0) { /* initial press */
_XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient,
DixUnknownAccess, &button);
if (!dev || !dev->public.on)
return 1;
- if (xkbi->device == inputInfo.keyboard)
- return 0;
-
button= pAction->devbtn.button;
if ((button<1)||(button>dev->button->numButtons))
return 1;