From ea4520ac30ee07b2df18f47469b03921dbdf20df Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Mon, 21 Jul 2008 16:15:58 -0400
Subject: [PATCH] Avoid destroying still attached back-end server pictures in
 dmxBEDestroyResources.

---
 hw/dmx/dmxextension.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index bd0fa274d..3d418755e 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -2310,9 +2310,14 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
 		    dmxBESavePixmap(pPixmap);
 		    dmxBEFreePixmap(pPixmap);
 		}
+
+		dmxBEFreePicture(pScreen, (PicturePtr)value);
 	    }
 	}
-	dmxBEFreePicture(pScreen, (PicturePtr)value);
+	else
+	{
+	    dmxBEFreePicture(pScreen, (PicturePtr)value);
+	}
     } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
 	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
 #endif