From 93aa1654be9d93fcfa849b3af5db3e45a18c9311 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Oct 2023 22:20:38 +1100 Subject: [PATCH] Fix crash caused by bl_keymap_validate clearing key-maps The fix for disabling add-ons #113206 caused a crash when the bl_keymap_validate test exited. This happened because add-on unregister would try to remove key-map items that had been freed. Resolve by disabling all addons instead of clearing the keymaps. --- tests/python/bl_keymap_validate.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/python/bl_keymap_validate.py b/tests/python/bl_keymap_validate.py index e7d1bd63a1e..9d85a8a7db4 100644 --- a/tests/python/bl_keymap_validate.py +++ b/tests/python/bl_keymap_validate.py @@ -273,10 +273,8 @@ def main() -> None: relaxed = "--relaxed" in argv # NOTE(@ideasman42): Disable add-on items as they may cause differences in the key-map. - # An alternative would be to disable all add-ons, but this is simpler. - if kc_addon := bpy.context.window_manager.keyconfigs.addon: - kc_addon.keymaps.clear() - del kc_addon + import addon_utils + addon_utils.disable_all() has_error = False