diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-03 11:21:31 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-14 13:36:58 +1000 |
| commit | df842009a99100d81c645fa2877a3a67a42b2563 (patch) | |
| tree | e05514c67af7a8b8cd8a7f05ee661d94ff1796e8 /Xi | |
| parent | d55009f87fca7e2e160901af4755311cc6b0431f (diff) | |
Xi: reset device properties to NULL after deleting them. (#25374)
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@who-t.net>
Tested-by: Andy Furniss <lists@andyfurniss.entadsl.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit ea14a418214ba4c58910f5650d8b25b3fc3a7099)
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/xiproperty.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index ecb326ee3..ea66c54c6 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) |