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/Composite.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/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 e48671879..4cdcda9df 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -59,7 +59,7 @@ void nxagentCompositeExtensionInit(void) nxagentCompositeEnable = 0; - if (nxagentOption(Composite) == 1) + if (nxagentOption(Composite)) { int eventBase, errorBase; @@ -119,7 +119,7 @@ void nxagentRedirectDefaultWindows(void) { int i; - if (nxagentOption(Rootless) == 1 || + if (nxagentOption(Rootless) || nxagentCompositeEnable == 0) { #ifdef TEST @@ -159,7 +159,7 @@ void nxagentRedirectDefaultWindows(void) void nxagentRedirectWindow(WindowPtr pWin) { - if (nxagentOption(Rootless) == 0 || + if (!nxagentOption(Rootless) || nxagentCompositeEnable == 0) { #ifdef TEST |