summaryrefslogtreecommitdiff
path: root/xserver/dix
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2014-11-22 08:33:47 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2014-11-22 08:33:47 +0000
commitc1cddfee651789d9b11e4eeaa4ea2fcfb9ad8bcb (patch)
tree23e5b2c6ab8b2c169fff2e94dbc7c2878cdf034e /xserver/dix
parentfb2ead5cf835f4775839ddf3bd6d4967f11ac599 (diff)
Update to xserver 1.16.2
Diffstat (limited to 'xserver/dix')
-rw-r--r--xserver/dix/devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xserver/dix/devices.c b/xserver/dix/devices.c
index 7f079ffa1..9e1c546e8 100644
--- a/xserver/dix/devices.c
+++ b/xserver/dix/devices.c
@@ -416,7 +416,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
XISendDeviceHierarchyEvent(flags);
}
- if (!IsMaster(dev))
+ if (!IsMaster(dev) && !IsFloating(dev))
XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, 0);
RecalculateMasterButtons(dev);