[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40686] trunk/blender/source/blender/ python/intern/bpy_rna.c: take 2 at fixing the crash...

[Campbell Barton]

Revision: 40686
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40686
Author:   campbellbarton
Date:     2011-09-29 09:29:46 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
take 2 at fixing the crash...

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-09-29 09:19:15 UTC (rev 40685)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-09-29 09:29:46 UTC (rev 40686)
@@ -6242,7 +6242,7 @@
 
 	/* annoying!, need to check if the screen gets set to NULL which is a
 	 * hint that the file was actually re-loaded. */
-	const char is_valid_wm= (CTX_wm_manager(C) != NULL);
+	char is_valid_wm;
 
 	PropertyRNA *pret_single= NULL;
 	void *retdata_single= NULL;
@@ -6269,6 +6269,8 @@
 	if(C==NULL)
 		C= BPy_GetContext();
 
+	is_valid_wm= (CTX_wm_manager(C) != NULL);
+
 	bpy_context_set(C, &gilstate);
 
 	if (!is_static) {
@@ -6505,7 +6507,7 @@
 		if (    (!is_static) &&
 		        (ptr->data) &&
 		        (RNA_struct_is_a(ptr->type, &RNA_Operator)) &&
-		        is_valid_wm == (CTX_wm_manager(C) != NULL))
+		        (is_valid_wm == (CTX_wm_manager(C) != NULL)))
 		{
 			wmOperator *op= ptr->data;
 			reports= op->reports;