blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T75222: Crash activating menu search

This commit is contained in:
Campbell Barton 2020-04-01 20:59:50 +11:00
parent 186ac84210
commit ca0dcd830c
Notes: blender-bot 2023-02-13 23:17:13 +01:00 
Referenced by issue #75222, Crash with new Menu Search functionality
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -208,7 +208,7 @@ class TOPBAR_MT_editor_menus(Menu):
layout = self.layout
# Allow calling this menu directly (this might not be a header area).
if getattr(context.area, "show_menus"):
if getattr(context.area, "show_menus", False):
layout.menu("TOPBAR_MT_app", text="", icon='BLENDER')
else:
layout.menu("TOPBAR_MT_app", text="Blender")

15
source/blender/editors/interface/interface_templates.c
View File

@ -6827,12 +6827,15 @@ static void menu_types_add_from_keymap_items(bContext *C,
{
wmWindowManager *wm = CTX_wm_manager(C);
ListBase *handlers[] = {
&region->handlers,
&sa->handlers,
region ? &region->handlers : NULL,
sa ? &sa->handlers : NULL,
&win->handlers,
};
for (int handler_index = 0; handler_index < ARRAY_SIZE(handlers); handler_index++) {
if (handlers[handler_index] == NULL) {
continue;
}
LISTBASE_FOREACH (wmEventHandler *, handler_base, handlers[handler_index]) {
/* During this loop, ui handlers for nested menus can tag multiple handlers free. */
if (handler_base->flag & WM_HANDLER_DO_FREE) {
@ -7092,11 +7095,15 @@ static struct MenuSearch_Data *menu_items_from_ui_create(bContext *C,
menu_items_from_ui_create_item_from_button(data, memarena, mt, drawstr_submenu, sub_but);
}
BLI_remlink(&region->uiblocks, sub_block);
if (region) {
BLI_remlink(&region->uiblocks, sub_block);
}
UI_block_free(NULL, sub_block);
}
}
BLI_remlink(&region->uiblocks, block);
if (region) {
BLI_remlink(&region->uiblocks, block);
}
UI_block_free(NULL, block);
/* Add key-map items as a second pass,