[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52968] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Bugfix, IRC report:

[Ton Roosendaal]

Revision: 52968
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52968
Author:   ton
Date:     2012-12-13 11:27:21 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
Bugfix, IRC report:

If a new userpref.blend was loaded, but no startup.blend existed yet, Blender crashed.

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	2012-12-13 10:58:00 UTC (rev 52967)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2012-12-13 11:27:21 UTC (rev 52968)
@@ -529,10 +529,6 @@
 		success = (BKE_read_file(C, startstr, NULL) != BKE_READ_FILE_FAIL);
 		
 	}
-	if (!from_memory && BLI_exists(prefstr)) {
-		success = BKE_read_file_userdef(prefstr, NULL);
-		if (success) printf("read new prefs: %s\n", prefstr);
-	}
 	
 	if (U.themes.first == NULL) {
 		printf("\nError: No valid "STRINGIFY (BLENDER_STARTUP_FILE)", fall back to built-in default.\n\n");
@@ -550,6 +546,12 @@
 #endif
 	}
 	
+	/* check new prefs only after startup.blend was finished */
+	if (!from_memory && BLI_exists(prefstr)) {
+		int done = BKE_read_file_userdef(prefstr, NULL);
+		if (done) printf("read new prefs: %s\n", prefstr);
+	}
+	
 	/* prevent buggy files that had G_FILE_RELATIVE_REMAP written out by mistake. Screws up autosaves otherwise
 	 * can remove this eventually, only in a 2.53 and older, now its not written */
 	G.fileflags &= ~G_FILE_RELATIVE_REMAP;