[PATCH] Xi: reset device properties to NULL after deleting them. (#25374)

Peter Hutterer peter.hutterer at who-t.net
Thu Dec 3 16:03:55 PST 2009


Commit 0e6cee853d8e5bef3274e632ef034d37f14674a9 introduced cleanup code to
remove the accel properties when switching schemes. The same code is
triggered by the default closedown code but only after unconditionally
removing all device properties (as part of the cleanup). The properties,
although deleted, never got reset to NULL.

X.Org Bug 25374 <http://bugs.freedesktop.org/show_bug.cgi?id=25374>

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Tested-by: Andy Furniss <lists at andyfurniss.entadsl.com>
---
 Xi/xiproperty.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index ecb326e..ea66c54 100644
--- a/Xi/xiproperty.c
+++ b/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)
-- 
1.6.5.2


More information about the xorg-devel mailing list