diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:31:05 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:31:05 +0100 |
| commit | ab3e1485010ecb549bb09c4321d24b391eac82a1 (patch) | |
| tree | fdf511f26aff06042430a518029875b0d27b3477 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 70cb1926ca433736830c42250e049203262560e4 (diff) | |
| parent | 26b033b84e682bfe098711204418319f753a34dc (diff) | |
| download | nx-libs-ab3e1485010ecb549bb09c4321d24b391eac82a1.tar.gz nx-libs-ab3e1485010ecb549bb09c4321d24b391eac82a1.tar.bz2 nx-libs-ab3e1485010ecb549bb09c4321d24b391eac82a1.zip | |
Merge branch 'uli42-pr/keyboard_cleanup' into 3.6.x
Attributes GH PR #742: https://github.com/ArcticaProject/nx-libs/pull/742
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 6d15f2021..4b1ae03f9 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 || |