[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32988] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Bugfix #24570

Ton Roosendaal ton at blender.org
Wed Nov 10 17:49:42 CET 2010


Revision: 32988
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32988
Author:   ton
Date:     2010-11-10 17:49:42 +0100 (Wed, 10 Nov 2010)

Log Message:
-----------
Bugfix #24570

When using a startup.blend without user prefs (themes etc) saved, Blender
crashed. Added a provision to then fall back to the compiled in startup, 
including a print in console.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-11-10 16:22:19 UTC (rev 32987)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-11-10 16:49:42 UTC (rev 32988)
@@ -340,7 +340,7 @@
 	ListBase wmbase;
 	char tstr[FILE_MAXDIR+FILE_MAXFILE];
 	int from_memory= op && strcmp(op->type->idname, "WM_OT_read_factory_settings")==0;
-	int success;
+	int success= 0;
 	
 	free_ttfont(); /* still weird... what does it here? */
 		
@@ -366,7 +366,13 @@
 	
 	if (!from_memory && BLI_exists(tstr)) {
 		success = BKE_read_file(C, tstr, NULL);
-	} else {
+		
+		if(U.themes.first==NULL) {
+			printf("\nError: No valid startup.blend, fall back to built-in default.\n\n");
+			success = 0;
+		}
+	}
+	if(success==0) {
 		success = BKE_read_file_from_memory(C, datatoc_startup_blend, datatoc_startup_blend_size, NULL);
 		if (wmbase.first == NULL) wm_clear_default_size(C);
 	}





More information about the Bf-blender-cvs mailing list