aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-07-18 19:14:40 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-09 15:31:57 +0100
commitb8ae794e47cf2e23f7391856865d4e06c7a61fd1 (patch)
treea449c22d07fc0fefd8675341b122b700ab755b39
parent05e03b965855e13557745d25eabe63698cb61bc1 (diff)
downloadnx-libs-b8ae794e47cf2e23f7391856865d4e06c7a61fd1.tar.gz
nx-libs-b8ae794e47cf2e23f7391856865d4e06c7a61fd1.tar.bz2
nx-libs-b8ae794e47cf2e23f7391856865d4e06c7a61fd1.zip
Keyboard.c: fix keyboard=query logic
an empty nxagentKeyboard variable is no reason to fall back to no-XKB mode
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index ff23ba232..eea09a436 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -849,7 +849,7 @@ XkbError:
XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
nxagentBell, nxagentChangeKeyboardControl);
- if (!nxagentKeyboard || strcmp(nxagentKeyboard, "query") == 0)
+ if (nxagentKeyboard && strcmp(nxagentKeyboard, "query") == 0)
{
goto XkbError;
}