[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52945] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Crash, IRC report.

[Ton Roosendaal]

Revision: 52945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52945
Author:   ton
Date:     2012-12-12 19:56:24 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Crash, IRC report.

Moving panels in a buttons-region around was calling menu code, reading NULL pointer.
Seems to be an existing issue, not caused by my previous commit :)

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 19:54:14 UTC (rev 52944)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-12-12 19:56:24 UTC (rev 52945)
@@ -6927,11 +6927,12 @@
 		if (data->state == BUTTON_STATE_MENU_OPEN) {
 			/* handle events for menus and their buttons recursively,
 			 * this will handle events from the top to the bottom menu */
-			retval = ui_handle_menus_recursive(C, event, data->menu, 0);
+			if (data->menu)
+				retval = ui_handle_menus_recursive(C, event, data->menu, 0);
 
 			/* handle events for the activated button */
 			if (retval == WM_UI_HANDLER_CONTINUE || event->type == TIMER) {
-				if (data->menu->menuretval)
+				if (data->menu && data->menu->menuretval)
 					ui_handle_button_return_submenu(C, event, but);
 				else
 					ui_handle_button_event(C, event, but);