CVS commit: [netbsd-6-0] xsrc/external/mit/xf86-video-wsfb/dist/src

[SAITOH Masanobu]

Module Name:    xsrc
Committed By:   msaitoh
Date:           Thu Aug  7 09:12:36 UTC 2014

Modified Files:
        xsrc/external/mit/xf86-video-wsfb/dist/src [netbsd-6-0]: wsfb_driver.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1101):
        xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c: revision 1.17
Call removeShadow only when shadowFB has been initialized.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 \
    xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13.4.1
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.13	Fri Jul 22 15:12:01 2011
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c	Thu Aug  7 09:12:36 2014
@@ -989,7 +989,8 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr
 	TRACE_ENTER("WsfbCloseScreen");
 
 	pPixmap = pScreen->GetScreenPixmap(pScreen);
-	shadowRemove(pScreen, pPixmap);
+	if (fPtr->shadowFB)
+		shadowRemove(pScreen, pPixmap);
 
 	if (pScrn->vtSema) {
 		WsfbRestore(pScrn);