[xserver-commit] xserver/mi mipointer.c,3.12,3.13 midispcur.c,1.13,1.14

[Jaymz Julian]

Committed by: jaymz

Update of /cvs/xserver/xserver/mi
In directory pdx:/tmp/cvs-serv21951/mi

Modified Files:
	mipointer.c midispcur.c 
Log Message:
I like cows.  and NULL checks.



Index: mipointer.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/mipointer.c,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -d -r3.12 -r3.13
--- mipointer.c	11 Sep 2003 05:12:51 -0000	3.12
+++ mipointer.c	4 Feb 2004 15:56:07 -0000	3.13
@@ -145,7 +145,10 @@
 	miPointer.pSpriteScreen = 0;
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     xfree ((pointer) pScreenPriv);
-    return (*pScreen->CloseScreen) (index, pScreen);
+    if(pScreen->CloseScreen)
+        return (*pScreen->CloseScreen) (index, pScreen);
+    else
+	return TRUE;
 }
 
 /*

Index: midispcur.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/midispcur.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- midispcur.c	7 Nov 2003 23:29:29 -0000	1.13
+++ midispcur.c	4 Feb 2004 15:56:07 -0000	1.14
@@ -186,7 +186,10 @@
     tossPict (pScreenPriv->pTempPicture);
 #endif
     xfree ((pointer) pScreenPriv);
-    return (*pScreen->CloseScreen) (index, pScreen);
+    if(pScreen->CloseScreen)
+        return (*pScreen->CloseScreen) (index, pScreen);
+    else
+	return TRUE;
 }
 
 static Bool