aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-12-30 20:07:57 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-01-15 16:26:31 +0100
commit2b4ccc30a7c35593cdd0ec9c19f74cc8217d2a94 (patch)
treedc498027532bad2d23ef072c9b9acd6f6a8ace48 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
parenta85adf5ea25ed8c3b7f72ffbd04cda0122f1b5a1 (diff)
downloadnx-libs-2b4ccc30a7c35593cdd0ec9c19f74cc8217d2a94.tar.gz
nx-libs-2b4ccc30a7c35593cdd0ec9c19f74cc8217d2a94.tar.bz2
nx-libs-2b4ccc30a7c35593cdd0ec9c19f74cc8217d2a94.zip
nxagent: treat several nxagentOptions as real Booleans
Adaptive, Composite, DeviceControl, DeviceControlUserDefined, IgnoreVisibility, InhibitXkb, Nested, Menu, MagicPixel, Persistent, Reset, ResetzKeyboardAtResume, SharedMemory, SharedPixmaps, Streaming, UseDamage, ViewOnly, Xdmcp, Xinerama
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Reconnect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 602351d10..ffdab066a 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 the state became SESSION_DOWN.
*/
nxagentException.ioError = 0;
- if (nxagentOption(Persistent) == 1 && nxagentSessionState != SESSION_STARTING)
+ if (nxagentOption(Persistent) && nxagentSessionState != SESSION_STARTING)
{
if (nxagentSessionState == SESSION_UP)
{
@@ -588,7 +588,7 @@ Bool nxagentReconnectSession(void)
}
/* Reset the keyboard only if we detect any changes. */
- if (nxagentOption(ResetKeyboardAtResume) == 1)
+ if (nxagentOption(ResetKeyboardAtResume))
{
if (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL ||
strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 ||
@@ -630,7 +630,7 @@ Bool nxagentReconnectSession(void)
nxagentRedirectDefaultWindows();
- if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama) == True)
+ if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama))
{
nxagentChangeScreenConfig(0, nxagentOption(RootWidth),
nxagentOption(RootHeight), True);