From 968a79dcf5e17ac3963953ef56b8f94dbd75323b Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Wed, 2 Jun 2010 13:40:51 +0200 Subject: [PATCH] Change keyboard controls on slave keyboards (#27926) Makes the use of IsMaster in ProcChangeKeyboardControl consistent with other similar loops. Signed-off-by: Nicolas George Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- dix/devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index b0b465326..250a4980d 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2021,7 +2021,7 @@ ProcChangeKeyboardControl (ClientPtr client) keyboard = PickKeyboard(client); for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { - if ((pDev == keyboard || (!IsMaster(keyboard) && pDev->u.master == keyboard)) && + if ((pDev == keyboard || (!IsMaster(pDev) && pDev->u.master == keyboard)) && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) { ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess); if (ret != Success) @@ -2030,7 +2030,7 @@ ProcChangeKeyboardControl (ClientPtr client) } for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { - if ((pDev == keyboard || (!IsMaster(keyboard) && pDev->u.master == keyboard)) && + if ((pDev == keyboard || (!IsMaster(pDev) && pDev->u.master == keyboard)) && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) { ret = DoChangeKeyboardControl(client, pDev, vlist, vmask); if (ret != Success)