diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-18 11:42:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-22 14:35:45 +1000 |
| commit | e1ac704185dee31b427a46cd41a00ef7a28b4129 (patch) | |
| tree | 23f73f6e733abe5bb6460a5130481f2388d80907 /dix | |
| parent | febce8cb814df46018f6ae1e6a9daea019b8ad0a (diff) | |
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 <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |