diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:38:59 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:38:59 +0100 |
| commit | 669af5300f904d399edb96d17faf93104e055138 (patch) | |
| tree | 483d3b752d4771ca8b822574aea6f60e62dccc4d /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | a8c65ab6290d9516b733273098db50721e84bcec (diff) | |
| parent | 522106e207e7230da5e62fb88f2e47742fdf1b21 (diff) | |
| download | nx-libs-669af5300f904d399edb96d17faf93104e055138.tar.gz nx-libs-669af5300f904d399edb96d17faf93104e055138.tar.bz2 nx-libs-669af5300f904d399edb96d17faf93104e055138.zip | |
Merge branch 'uli42-pr/x2go_bypass' into 3.6.x
Attributes GH PR #744: https://github.com/ArcticaProject/nx-libs/pull/744
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 91445a383..a921df6ca 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -458,6 +458,16 @@ Bool nxagentReconnectSession(void) nxagentProcessOptions(nxagentOptionsFilenameOrString); + if (nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) + { + #ifdef TEST + fprintf(stderr, "nxagentReconnect: changing nxagentKeyboard from [null/null] to [clone].\n"); + #endif + + free(nxagentKeyboard); + nxagentKeyboard = strdup("clone"); + } + if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0) { failedStep = DISPLAY_STEP; |