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

Reconnect.c: restore old keyboard value if no new one is given
26b033b8 · Ulrich Sibiller · Mike Gabriel · 4dfe84ea · 26b033b8
Commit 26b033b8 authored Dec 03, 2018 by Ulrich Sibiller Committed by Mike Gabriel Dec 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

Reconnect.c nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +11 -0

No files found.
--- 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 ||