summaryrefslogtreecommitdiff
authorAaron Plattner <aplattner@nvidia.com>2007-09-20 21:00:33 (GMT)
committer Aaron Plattner <aplattner@nvidia.com>2007-09-20 21:00:33 (GMT)
commit50fa8722d35c12e5f0322cebe25faf99c39d4f50 (patch) (side-by-side diff)
treedb35a0cb1a026d6e60db1a6a8f269ca1fc922314
parentc140d20f4ade973496dcbbd06453402ef0c0e85c (diff)
downloadxserver-50fa8722d35c12e5f0322cebe25faf99c39d4f50.zip
xserver-50fa8722d35c12e5f0322cebe25faf99c39d4f50.tar.gz
Set noCompositeExtension to TRUE when failing to initialize the extension (e.g. when Xinerama is enabled).
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--composite/compext.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/composite/compext.c b/composite/compext.c
index 944f8d8..ece51d0 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -674,6 +674,9 @@ CompositeExtensionInit (void)
ExtensionEntry *extEntry;
int s;
+ /* Assume initialization is going to fail */
+ noCompositeExtension = TRUE;
+
for (s = 0; s < screenInfo.numScreens; s++) {
ScreenPtr pScreen = screenInfo.screens[s];
VisualPtr vis;
@@ -731,4 +734,7 @@ CompositeExtensionInit (void)
return;
miRegisterRedirectBorderClipProc (compSetRedirectBorderClip,
compGetRedirectBorderClip);
+
+ /* Initialization succeeded */
+ noCompositeExtension = FALSE;
}