From 4fe02b8da3ca58500f7e6e017e388907cf4a8b73 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 8 Aug 2018 15:22:41 +1000 Subject: [PATCH] dix: check_modmap_change() returns Success, not true Not sure what if anything calls XSetDeviceModifierMapping() but this would've failed all the time. check_modmap_change() returns Success but we were treating it like a boolean. Fix this. Reported-by: Adam Jackson Signed-off-by: Peter Hutterer Reviewed-by: Keith Packard --- dix/inpututils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/inpututils.c b/dix/inpututils.c index 6bff9efab..c51c83547 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -282,7 +282,7 @@ change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *modkeymap, else if (!IsFloating(dev) && GetMaster(dev, MASTER_KEYBOARD)->lastSlave == dev) { /* If this fails, expect the results to be weird. */ - if (check_modmap_change(client, dev->master, modmap)) + if (check_modmap_change(client, dev->master, modmap) == Success) do_modmap_change(client, dev->master, modmap); }