Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T49746: crash loading user preferences with missing operators.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-10-16 21:19:52 +02:00
parent 2a53e0975c
commit 2a6ec00b9b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/windowmanager/intern/wm_keymap.c
View File

@@ -77,6 +77,10 @@ static wmKeyMapItem *wm_keymap_item_copy(wmKeyMapItem *kmi)
kmin->properties = IDP_CopyProperty(kmin->properties); kmin->properties = IDP_CopyProperty(kmin->properties);
kmin->ptr->data = kmin->properties; kmin->ptr->data = kmin->properties;
} }
else {
kmin->properties = NULL;
kmin->ptr = NULL;
}
return kmin; return kmin;
} }
@@ -87,6 +91,8 @@ static void wm_keymap_item_free(wmKeyMapItem *kmi)
if (kmi->ptr) { if (kmi->ptr) {
WM_operator_properties_free(kmi->ptr); WM_operator_properties_free(kmi->ptr);
MEM_freeN(kmi->ptr); MEM_freeN(kmi->ptr);
kmi->ptr = NULL;
kmi->properties = NULL;
} }
} }
@@ -121,7 +127,6 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi)
else { else {
/* zombie keymap item */ /* zombie keymap item */
wm_keymap_item_free(kmi); wm_keymap_item_free(kmi);
kmi->ptr = NULL;
} }
} }
} }