diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-25 09:19:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-25 09:19:44 +0200 |
| commit | 9193d11eeeea933e293acd5e0f03fa4e9887186b (patch) | |
| tree | ef77450e741602ed50c478e2f3495c5d03431599 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 4ccb7eda5563ce7594245eb70aab6754e7b104c2 (diff) | |
| parent | 3f7b3001988bf921e6cd860f03a6256b1451ee3d (diff) | |
| download | nx-libs-9193d11eeeea933e293acd5e0f03fa4e9887186b.tar.gz nx-libs-9193d11eeeea933e293acd5e0f03fa4e9887186b.tar.bz2 nx-libs-9193d11eeeea933e293acd5e0f03fa4e9887186b.zip | |
Merge branch 'uli42-pr/cmdline' into 3.6.x
Attributes GH PR #484: https://github.com/ArcticaProject/nx-libs/pull/484
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, 3 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index fb2303549..902fe36be 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -103,6 +103,8 @@ extern Bool nxagentRenderEnable; extern char *nxagentKeyboard; +extern char *nxagentOptionsFilename; + enum SESSION_STATE nxagentSessionState = SESSION_STARTING; struct nxagentExceptionStruct nxagentException = {0, 0}; @@ -454,7 +456,7 @@ Bool nxagentReconnectSession(void) nxagentResetOptions(); - nxagentProcessOptionsFile(); + nxagentProcessOptionsFile(nxagentOptionsFilename); if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0) { |