[X2Go-Commits] [nx-libs] 25/51: Reconnect.c: restore old keyboard value if no new one is given

[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 26b033b84e682bfe098711204418319f753a34dc
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Dec 3 21:34:40 2018 +0100

    Reconnect.c: restore old keyboard value if no new one is given
    
    It may not fully fix the issue mentioned below but it does for the
    -keyboard commandline option at least.
    
    Fixes ArcticaProject/nx-libs#741
---
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 6d15f20..4b1ae03 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -584,6 +584,17 @@ Bool nxagentReconnectSession(void)
     goto nxagentReconnectError;
   }
 
+  /* if there's no keyboard definition in the options file
+     restore the previous value. */
+  #ifdef DEBUG
+  fprintf(stderr, "%s: nxagentKeyboard [%s] nxagentOldKeyboard [%s]\n", __func__, nxagentKeyboard, nxagentOldKeyboard);
+  #endif
+  if (nxagentKeyboard == NULL)
+  {
+    nxagentKeyboard = nxagentOldKeyboard;
+    nxagentOldKeyboard = NULL;
+  }
+
   if (nxagentOption(ResetKeyboardAtResume) == 1 &&
          (nxagentKeyboard  == NULL || nxagentOldKeyboard == NULL ||
              strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 ||

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