aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xorg-server/dix/inpututils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index 743e6208d..9d2bc3246 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -239,10 +239,10 @@ static int build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap,
if (modkeymap[i] >= MAP_LENGTH)
return BadValue;
- //if (modmap[modkeymap[i]]) It looks like it needlessly gives errors back
- // return BadValue;
+ if (modmap[modkeymap[i]])
+ return BadValue;
- modmap[modkeymap[i]] |= 1 << (i / max_keys_per_mod); // Now or it because of previous line removal
+ modmap[modkeymap[i]] = 1 << (i / max_keys_per_mod);
}
return Success;