xserver: Branch 'server-1.5-branch'

[Adam Jackson]

 dix/dispatch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f42ed6ca938d0dee66bdfd6237b6632a4f7ab0d
Author: Daniel Drake <dsd at laptop.org>
Date:   Tue Sep 2 16:20:40 2008 -0400

    Don't try to destroy a NULL pixmap.
    (cherry picked from commit 4e1f9f51a9eea115ce2a073824e9c5cef4e2f364)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index bb8b0c4..b913855 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1338,8 +1338,8 @@ CreatePmap:
 	}
 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
 	    return(client->noClientException);
+	(*pDraw->pScreen->DestroyPixmap)(pMap);
     }
-    (*pDraw->pScreen->DestroyPixmap)(pMap);
     return (BadAlloc);
 }