aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-15 08:09:08 +0000
committermarha <marha@users.sourceforge.net>2009-12-15 08:09:08 +0000
commitc915fe74ff1b1d02f7506a187bc9b588f5c21f97 (patch)
tree7ecc8f8867bac10fcfc1299469333178f7cf5838 /xorg-server/Xi
parent0925cb4f76a1667fb3777efbe6a0e0e69c4cca3c (diff)
parent9b17452909d3140fa33a753cadfaa6e9006b9685 (diff)
downloadvcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.gz
vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.bz2
vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Xi')
-rw-r--r--xorg-server/Xi/xiproperty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c
index ecb326ee3..ea66c54c6 100644
--- a/xorg-server/Xi/xiproperty.c
+++ b/xorg-server/Xi/xiproperty.c
@@ -622,6 +622,8 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
XIDestroyDeviceProperty(prop);
}
+ device->properties.properties = NULL;
+
/* Now free all handlers */
curr_handler = device->properties.handlers;
while(curr_handler)