diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-20 10:47:10 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-20 10:47:10 +0100 |
| commit | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (patch) | |
| tree | 925afe265c0f0a5a36b215e5bf68e6fe1c2e3bdf /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 39d45a0e8ff58a649e5c8e403f89e3b14ad1c9d2 (diff) | |
| parent | 4ef4fbf16eca01b40176a830bfa6a8ada95e357b (diff) | |
| download | nx-libs-3b640a0f8de615e53dd6801ebd2aa0cf04f76c69.tar.gz nx-libs-3b640a0f8de615e53dd6801ebd2aa0cf04f76c69.tar.bz2 nx-libs-3b640a0f8de615e53dd6801ebd2aa0cf04f76c69.zip | |
Merge branch 'uli42-pr/options_on_reconnect' into 3.6.x
Attributes GH PR #554: https://github.com/ArcticaProject/nx-libs/pull/554
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 902fe36be..cae0a397b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -103,7 +103,7 @@ extern Bool nxagentRenderEnable; extern char *nxagentKeyboard; -extern char *nxagentOptionsFilename; +extern char *nxagentOptionsFilenameOrString; enum SESSION_STATE nxagentSessionState = SESSION_STARTING; @@ -456,7 +456,7 @@ Bool nxagentReconnectSession(void) nxagentResetOptions(); - nxagentProcessOptionsFile(nxagentOptionsFilename); + nxagentProcessOptions(nxagentOptionsFilenameOrString); if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0) { |