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/Composite.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/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 4cdcda9df..e48671879 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)) + if (nxagentOption(Composite) == 1) { int eventBase, errorBase; @@ -119,7 +119,7 @@ void nxagentRedirectDefaultWindows(void) { int i; - if (nxagentOption(Rootless) || + if (nxagentOption(Rootless) == 1 || nxagentCompositeEnable == 0) { #ifdef TEST @@ -159,7 +159,7 @@ void nxagentRedirectDefaultWindows(void) void nxagentRedirectWindow(WindowPtr pWin) { - if (!nxagentOption(Rootless) || + if (nxagentOption(Rootless) == 0 || nxagentCompositeEnable == 0) { #ifdef TEST |