summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--driver/xf86-input-keyboard/src/bsd_kbd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/driver/xf86-input-keyboard/src/bsd_kbd.c b/driver/xf86-input-keyboard/src/bsd_kbd.c
index 852debab0..0151e4273 100644
--- a/driver/xf86-input-keyboard/src/bsd_kbd.c
+++ b/driver/xf86-input-keyboard/src/bsd_kbd.c
@@ -531,8 +531,12 @@ OpenKeyboard(InputInfoPtr pInfo)
pInfo->name, strerror(errno));
return TRUE;
}
+ if (KB_ENCODING(wsenc) == KB_USER)
+ /* Don't try to set XkbLayout */
+ return TRUE;
+
for (i = 0; kbdenc[i].val; i++)
- if (KB_ENCODING(wsenc) == kbdenc[i].val) {
+ if(KB_ENCODING(wsenc) == kbdenc[i].val) {
xf86Msg(X_PROBED, "%s: using wscons layout %s\n",
pInfo->name, kbdenc[i].name);
xf86addNewOption(pInfo->options, "XkbLayout", kbdenc[i].name);