xserver: Branch 'server-1.2-branch'
Eamon Walsh
ewalsh at kemper.freedesktop.org
Tue Nov 7 20:49:36 EET 2006
mi/miinitext.c | 10 ++++++++++
1 files changed, 10 insertions(+)
New commits:
diff-tree c9ff47033e81c1840dda9bb9568513cac0ba1fde (from e6778fee47aa24c8eb9b3305515acdc7dcdd8971)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 7 13:55:04 2006 -0500
Bug #8937: Extension setup functions not called on server resets
(cherry picked from 5e946dd853a4ebc2722ae023429ce5797de3d7a6 commit)
diff --git a/mi/miinitext.c b/mi/miinitext.c
index aafd014..8fd8c9c 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -754,6 +754,16 @@ InitExtensions(argc, argv)
/* Sort the extensions according the init dependencies. */
LoaderSortExtensions();
listInitialised = TRUE;
+ } else {
+ /* Call the setup functions on subsequent server resets as well */
+ for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
+ ext = &ExtensionModuleList[i];
+ if (ext->setupFunc != NULL &&
+ (ext->disablePtr == NULL ||
+ (ext->disablePtr != NULL && !*ext->disablePtr))) {
+ (ext->setupFunc)();
+ }
+ }
}
for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
More information about the xorg-commit
mailing list