diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
commit | 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch) | |
tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
parent | 586742b715a3e3451a4587439778c410a1970cdd (diff) | |
download | nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.gz nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.bz2 nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.zip |
Merge branch 'uli42-pr/revert' into 3.6.x
Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
Fixes ArcticaProject/nx-libs#772.
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, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index f7e585a79..a921df6ca 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -240,7 +240,7 @@ TODO: This should be reset only when */ nxagentException.ioError = 0; - if (nxagentOption(Persistent) && nxagentSessionState != SESSION_STARTING) + if (nxagentOption(Persistent) == 1 && nxagentSessionState != SESSION_STARTING) { if (nxagentSessionState == SESSION_UP) { @@ -338,7 +338,7 @@ void nxagentInitializeRecLossyLevel(void) void nxagentInitReconnector(void) { - nxagentReconnectTrap = False; + nxagentReconnectTrap = 0; reconnectLossyLevel[DISPLAY_STEP] = malloc(sizeof(int)); reconnectLossyLevel[SCREEN_STEP] = malloc(sizeof(int)); @@ -608,8 +608,8 @@ Bool nxagentReconnectSession(void) nxagentOldKeyboard = NULL; } - if (nxagentOption(ResetKeyboardAtResume) && - (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || + if (nxagentOption(ResetKeyboardAtResume) == 1 && + (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 || strcmp(nxagentKeyboard, "query") == 0 || strcmp(nxagentKeyboard, "clone") == 0)) @@ -648,7 +648,7 @@ Bool nxagentReconnectSession(void) nxagentRedirectDefaultWindows(); - if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) || nxagentOption(Xinerama)) + if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama) == True) { nxagentChangeScreenConfig(0, nxagentOption(RootWidth), nxagentOption(RootHeight)); |