[X2Go-Commits] [nx-libs] 92/108: Keyboard.c: fix keyboard=query logic

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit b8ae794e47cf2e23f7391856865d4e06c7a61fd1
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Jul 18 19:14:40 2018 +0200

    Keyboard.c: fix keyboard=query logic
    
    an empty nxagentKeyboard variable is no reason to fall back to no-XKB mode
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index ff23ba2..eea09a4 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;
         }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git