1 files changed, 5 insertions, 1 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 7197204ef..ec122407b 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -1106,7 +1106,11 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config
     int err;
 
     err = dixLookupDrawable(&pDraw, drawableId, client, 0, DixAddAccess);
-    if (err != Success || pDraw->type != DRAWABLE_PIXMAP) {
+    if (err != Success) {
+	client->errorValue = drawableId;
+	return err;
+    }
+    if (pDraw->type != DRAWABLE_PIXMAP) {
 	client->errorValue = drawableId;
 	return BadPixmap;
     }