diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-13 12:32:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-13 12:32:06 +0100 |
| commit | b61934be2e9b4a8d3112270b0e691d47f99ba39f (patch) | |
| tree | d0cb58feeddb553a6e9ab6daea5056bd0221eb2b /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 427ac344c53acf4cb361f24e1df771137f83ea6b (diff) | |
| parent | 16cd2bbe1c4425e3fa557f9ca0723aa94a50b071 (diff) | |
| download | nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.tar.gz nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.tar.bz2 nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.zip | |
Merge branch 'uli42-pr/misc' into 3.6.x
Attributes GH PR #766: https://github.com/ArcticaProject/nx-libs/pull/766
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 a921df6ca..f7e585a79 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) == 1 && nxagentSessionState != SESSION_STARTING) + if (nxagentOption(Persistent) && nxagentSessionState != SESSION_STARTING) { if (nxagentSessionState == SESSION_UP) { @@ -338,7 +338,7 @@ void nxagentInitializeRecLossyLevel(void) void nxagentInitReconnector(void) { - nxagentReconnectTrap = 0; + nxagentReconnectTrap = False; reconnectLossyLevel[DISPLAY_STEP] = malloc(sizeof(int)); reconnectLossyLevel[SCREEN_STEP] = malloc(sizeof(int)); @@ -608,8 +608,8 @@ Bool nxagentReconnectSession(void) nxagentOldKeyboard = NULL; } - if (nxagentOption(ResetKeyboardAtResume) == 1 && - (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || + if (nxagentOption(ResetKeyboardAtResume) && + (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) == True || nxagentOption(Xinerama) == True) + if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) || nxagentOption(Xinerama)) { nxagentChangeScreenConfig(0, nxagentOption(RootWidth), nxagentOption(RootHeight)); |