From 432768f75da13ee5343957df6ce5cd316a62929f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 8 Jan 2011 19:40:59 +0000
Subject: xserver mesa libX11 xkbcomp pixman git update 8/1/2011

---
 xorg-server/dix/property.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'xorg-server/dix/property.c')

diff --git a/xorg-server/dix/property.c b/xorg-server/dix/property.c
index 2ba3f4419..53b9821a9 100644
--- a/xorg-server/dix/property.c
+++ b/xorg-server/dix/property.c
@@ -424,6 +424,9 @@ DeleteAllWindowProperties(WindowPtr pWin)
 	dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY);
 	pProp = pNextProp;
     }
+
+    if (pWin->optional)
+        pWin->optional->userProps = NULL;
 }
 
 static int
-- 
cgit v1.2.3