summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c')
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c b/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c
index 0d80ab2a9..6f35ae50a 100644
--- a/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c
+++ b/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.9 2000/03/03 00:22:47 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.10 2001/02/16 12:18:04 eich Exp $ */
#include "X.h"
@@ -152,11 +152,11 @@ static Bool
cfb8_32CloseScreen (int i, ScreenPtr pScreen)
{
cfb8_32ScreenPtr pScreenPriv = CFB8_32_GET_SCREEN_PRIVATE(pScreen);
-
if(pScreenPriv->visualData)
xfree(pScreenPriv->visualData);
xfree((pointer) pScreenPriv);
+ pScreen->devPrivates[cfb8_32ScreenPrivateIndex].ptr = NULL;
return(cfb32CloseScreen(i, pScreen));
}
@@ -266,10 +266,8 @@ cfb8_32SetupVisuals (ScreenPtr pScreen)
}
overlayVisualsAtom = MakeAtom(atomString, sizeof(atomString) - 1, TRUE);
-
xf86RegisterRootWindowProperty(pScreen->myNum, overlayVisualsAtom,
overlayVisualsAtom, 32, numVisuals * 4, overlayVisuals);
-
pScreenPriv->visualData = (pointer)overlayVisuals;
}