diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:27:32 +0100 |
commit | faae65fb3693fd1020e740e00f9038607bc4a430 (patch) | |
tree | 8ee59a2342f6320f9e8dc3e714b118e106f8d64d /nx-X11/programs/Xserver/hw/nxagent/Composite.c | |
parent | d545afdf3967b0305c1215bb9f8a545b81fc24e8 (diff) | |
parent | b44ecc0f897a5d03445aafc120e54b6475699254 (diff) | |
download | nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.gz nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.tar.bz2 nx-libs-faae65fb3693fd1020e740e00f9038607bc4a430.zip |
Merge branch 'uli42-pr/rework_booleans_v2' into 3.6.x
Attributes GH PR #980: https://github.com/ArcticaProject/nx-libs/pull/980
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Composite.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Composite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c index af29f8ebc..745696219 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -57,7 +57,7 @@ void nxagentCompositeExtensionInit(void) nxagentCompositeEnable = 0; - if (nxagentOption(Composite) == 1) + if (nxagentOption(Composite)) { int eventBase, errorBase; @@ -115,7 +115,7 @@ void nxagentCompositeExtensionInit(void) void nxagentRedirectDefaultWindows(void) { - if (nxagentOption(Rootless) == 1 || + if (nxagentOption(Rootless) || nxagentCompositeEnable == 0) { #ifdef TEST @@ -154,7 +154,7 @@ void nxagentRedirectDefaultWindows(void) void nxagentRedirectWindow(WindowPtr pWin) { - if (nxagentOption(Rootless) == 0 || + if (!nxagentOption(Rootless) || nxagentCompositeEnable == 0) { #ifdef TEST |