[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20017] trunk/blender/source/blender/ python/api2_2x/Draw.c: [#18654] different behaviour if script is called from (1) Menu (2) TextEditor (3) ScriptsWindow [including crash!]

[Campbell Barton]

Revision: 20017
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20017
Author:   campbellbarton
Date:     2009-05-01 16:19:56 +0200 (Fri, 01 May 2009)

Log Message:
-----------
[#18654] different behaviour if script is called from (1) Menu (2) TextEditor (3) ScriptsWindow [including crash!]
bugfix, simple NULL check

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/Draw.c

Modified: trunk/blender/source/blender/python/api2_2x/Draw.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Draw.c	2009-05-01 11:57:14 UTC (rev 20016)
+++ trunk/blender/source/blender/python/api2_2x/Draw.c	2009-05-01 14:19:56 UTC (rev 20017)
@@ -915,12 +915,12 @@
 	exit_pydraw( sc, 0 );
 
 	script = sc->script;
-
-	/* remove our lock to the current namespace */
-	script->flags &= ~SCRIPT_GUI;
-	script->scriptname[0] = '\0';
-	script->scriptarg[0] = '\0';
-
+	if(script) { /* in very rare cases this can be NULL, (when saving and loading see bug #18654)*/
+		/* remove our lock to the current namespace */
+		script->flags &= ~SCRIPT_GUI;
+		script->scriptname[0] = '\0';
+		script->scriptarg[0] = '\0';
+	}
 	Py_RETURN_NONE;
 }