[PATCH 2/2] Xvfb: destroy the screen pixmap in CloseScreen

Julien Cristau jcristau at debian.org
Fri May 11 12:31:50 PDT 2012


---
 hw/vfb/InitOutput.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index e2cd96c..16edf43 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -774,6 +774,13 @@ vfbCloseScreen(int index, ScreenPtr pScreen)
     for (i = 0; i < screenInfo.numScreens; i++)
         SetInstalledColormap(screenInfo.screens[i], NULL);
 
+    /*
+     * fb overwrites miCloseScreen, so do this here
+     */
+    if (pScreen->devPrivate)
+        (*pScreen->DestroyPixmap) (pScreen->devPrivate);
+    pScreen->devPrivate = NULL;
+
     return pScreen->CloseScreen(index, pScreen);
 }
 
-- 
1.7.10



More information about the xorg-devel mailing list