[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52919] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Bug fix [#33492] Right click on ' confirm reload' crashes
Ton Roosendaal
ton at blender.org
Wed Dec 12 13:18:32 CET 2012
Revision: 52919
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52919
Author: ton
Date: 2012-12-12 12:18:29 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
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)
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-12-12 11:12:37 UTC (rev 52918)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-12-12 12:18:29 UTC (rev 52919)
@@ -4629,7 +4629,6 @@
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 @@
}
/* 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 */
More information about the Bf-blender-cvs
mailing list