From 5c7aef148de23f39027fda647bbb53bb5b992683 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu, 25 May 2006 09:57:47 +0000
Subject: [PATCH] Don't destroy a pixmap twice on server exit (bugzilla #4247).

---
 ChangeLog      | 5 +++++
 mi/midispcur.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d69c628b8..d40f7542d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-25  Matthieu Herrb <matthieu.herrb@laas.fr>
+
+	* mi/midispcur.c: (miDCCloseScreen)
+	Don't destroy a pixmap twice on server exit (bugzilla #4247).
+
 2006-05-24  Jeremy C. Reed  <reed@reedmedia.net>
 
 	* hw/xfree86/utils/xorgcfg/text-mode.c:
diff --git a/mi/midispcur.c b/mi/midispcur.c
index 71b374fbc..597d27289 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -184,7 +184,9 @@ miDCCloseScreen (index, pScreen)
     tossPix (pScreenPriv->pSave);
     tossPix (pScreenPriv->pTemp);
 #ifdef ARGB_CURSOR
+#if 0				/* This has been free()d before */
     tossPict (pScreenPriv->pRootPicture);
+#endif 
     tossPict (pScreenPriv->pTempPicture);
 #endif
     xfree ((pointer) pScreenPriv);