diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 12:59:56 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 12:59:56 +0200 |
commit | 59a0620f68e9377001f23f5f491a8b02b520d685 (patch) | |
tree | 977e12e055ffb34eb671eaa428afd22633cf6d48 /nx-X11/programs/Xserver/composite | |
parent | 6208dade860c6429791a5897136506adfd505e9d (diff) | |
parent | fcc1b57fb980b821138301a9585b91d10bfd0901 (diff) | |
download | nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.tar.gz nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.tar.bz2 nx-libs-59a0620f68e9377001f23f5f491a8b02b520d685.zip |
Merge branch 'uli42-pr/various7' into 3.6.x
Attributes GH PR #1007: https://github.com/ArcticaProject/nx-libs/pull/1007
Diffstat (limited to 'nx-X11/programs/Xserver/composite')
-rw-r--r-- | nx-X11/programs/Xserver/composite/compext.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/composite/compext.c b/nx-X11/programs/Xserver/composite/compext.c index 8513c6d73..a63b02075 100644 --- a/nx-X11/programs/Xserver/composite/compext.c +++ b/nx-X11/programs/Xserver/composite/compext.c @@ -39,6 +39,7 @@ static DevPrivateKeyRec CompositeClientPrivateKeyRec; #define CompositeClientPrivateKey (&CompositeClientPrivateKeyRec) #else /* !defined(NXAGENT_SERVER) */ +#include "../hw/nxagent/Options.h" static int CompositeClientPrivIndex = -1; #endif /* !defined(NXAGENT_SERVER) */ @@ -623,6 +624,11 @@ CompositeExtensionInit (void) /* Assume initialization is going to fail */ noCompositeExtension = TRUE; +#ifdef NXAGENT_SERVER + if (!nxagentOption(Composite)) + return; +#endif + fprintf(stderr, "COMPOSITE: trying to initialize extension.\n"); for (s = 0; s < screenInfo.numScreens; s++) { |