diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-18 22:15:50 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2017-11-18 23:55:02 +0100 |
| commit | 76ce623abfd61c71912585a3c24d36cdc1d0a7b4 (patch) | |
| tree | 3379cc70950d1d5589b2d81ab5b5a37784563d99 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 39d45a0e8ff58a649e5c8e403f89e3b14ad1c9d2 (diff) | |
| download | nx-libs-76ce623abfd61c71912585a3c24d36cdc1d0a7b4.tar.gz nx-libs-76ce623abfd61c71912585a3c24d36cdc1d0a7b4.tar.bz2 nx-libs-76ce623abfd61c71912585a3c24d36cdc1d0a7b4.zip | |
Fix options parsing on reconnect
Commit 3f7b3001988bf921e6cd860f03a6256b1451ee3d was incomplete: the
options parameter was not parsed as a string on reconnect. It was
always assumed to be a filename.
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) { |