From d348ab06aae21c153ecbc3511aeafc8ab66d8303 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 11 May 2012 21:31:50 +0200 Subject: Xvfb: destroy the screen pixmap in CloseScreen Signed-off-by: Peter Hutterer Reviewed-by: Peter Hutterer --- hw/vfb/InitOutput.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index e2cd96cdc..16edf4307 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); } -- cgit v1.2.3