Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-02-13 13:02:47 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-02-13 13:05:14 +0300
commit57f0b175d7c90886ef61e06a991f15c9e1da723c (patch)
tree87aab7656cec043e764b334a078ef1201ce58f8d /source/blender/editors/interface/interface_context_menu.c
parent539cbf639faff9c92cc0eb53273c367838216e77 (diff)
Fix T61487: quick favorites crash outside of open preferences window
Diffstat (limited to 'source/blender/editors/interface/interface_context_menu.c')
-rw-r--r--source/blender/editors/interface/interface_context_menu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c
index 0f5d3bb28c8..d8928e81ccd 100644
--- a/source/blender/editors/interface/interface_context_menu.c
+++ b/source/blender/editors/interface/interface_context_menu.c
@@ -710,7 +710,9 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but)
item_found = true;
}
}
- MEM_freeN(um_array);
+ if (um_array) {
+ MEM_freeN(um_array);
+ }
if (!item_found) {
but2 = uiDefIconTextBut(