[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42577] trunk/blender/source/blender/ editors/interface: fix for 2 crashes running operators in background mode.

[Campbell Barton]

Revision: 42577
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42577
Author:   campbellbarton
Date:     2011-12-12 03:25:10 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
fix for 2 crashes running operators in background mode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/interface/interface_ops.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-12-11 23:41:15 UTC (rev 42576)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-12-12 03:25:10 UTC (rev 42577)
@@ -5492,6 +5492,11 @@
 	ARegion *ar_ctx= CTX_wm_region(C);
 	uiBlock *block;
 
+	/* background mode */
+	if (ar_ctx == NULL) {
+		return NULL;
+	}
+
 	/* scan active regions ui */
 	for(block=ar_ctx->uiblocks.first; block; block=block->next) {
 		if (block->ui_operator) {

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2011-12-11 23:41:15 UTC (rev 42576)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2011-12-12 03:25:10 UTC (rev 42577)
@@ -458,11 +458,16 @@
 	 *	- otherwise, up to info (which is what users normally see)
 	 */
 	str = BKE_reports_string(reports, (G.f & G_DEBUG)? RPT_DEBUG : RPT_INFO);
-	
-	write_text(txt, str);
-	MEM_freeN(str);
-	
-	return OPERATOR_FINISHED;
+
+	if (str) {
+		write_text(txt, str);
+		MEM_freeN(str);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
 }
 
 static void UI_OT_reports_to_textblock(wmOperatorType *ot)