From e1ac704185dee31b427a46cd41a00ef7a28b4129 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Feb 2011 11:42:09 +1000 Subject: dix: fix up a master check in ChangeKeyboardMapping handling. We don't just care about the directly attached master, we care about the master keyboard. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- dix/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dix/devices.c') diff --git a/dix/devices.c b/dix/devices.c index 8be1903eb..f7018d0d1 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1664,7 +1664,7 @@ ProcChangeKeyboardMapping(ClientPtr client) stuff->keyCodes, NULL, client); for (tmp = inputInfo.devices; tmp; tmp = tmp->next) { - if (IsMaster(tmp) || tmp->u.master != pDev) + if (IsMaster(tmp) || GetMaster(tmp, MASTER_KEYBOARD) != pDev) continue; if (!tmp->key) continue; -- cgit v1.2.3