diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-12-12 16:18:29 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-12-12 16:18:29 +0400 |
| commit | 868cb64d6c4ffad573bb9d7003afdaf06787dd43 (patch) | |
| tree | 478189d5a660a2aca4fdaf1d3e8a309b6c608008 | |
| parent | 0ec099f2828921c6aa69987c9bfe51a4971a8c5d (diff) | |
Bug fix [#33492] Right click on 'confirm reload' crashes
Context check could result in NULL - added provision for it and made
sure the check is local only (for 1 new option)
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b80025e0d77..1ac56fd30bb 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4629,7 +4629,6 @@ static void popup_add_shortcut_func(bContext *C, void *arg1, void *UNUSED(arg2)) static int ui_but_menu(bContext *C, uiBut *but) { - ARegion *ar = CTX_wm_region(C); uiPopupMenu *pup; uiLayout *layout; int length; @@ -4845,9 +4844,13 @@ static int ui_but_menu(bContext *C, uiBut *but) } /* Show header tools for header buttons. */ - if (ar->regiontype == RGN_TYPE_HEADER) { - uiItemMenuF(layout, IFACE_("Header"), ICON_NONE, ED_screens_header_tools_menu_create, NULL); - uiItemS(layout); + if (CTX_wm_region(C)) { + ARegion *ar = CTX_wm_region(C); + if (ar->regiontype == RGN_TYPE_HEADER) { + + uiItemMenuF(layout, IFACE_("Header"), ICON_NONE, ED_screens_header_tools_menu_create, NULL); + uiItemS(layout); + } } { /* Docs */ |