[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32616] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Partial fix for bug #24341, " Problems running blender headless"

Nicholas Bishop nicholasbishop at gmail.com
Thu Oct 21 01:13:12 CEST 2010


Revision: 32616
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32616
Author:   nicholasbishop
Date:     2010-10-21 01:13:12 +0200 (Thu, 21 Oct 2010)

Log Message:
-----------
Partial fix for bug #24341, "Problems running blender headless"

* Fixed the random file popping up.
* Don't write to the history file in background mode, because ghost won't give us the right directory in that case

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-10-20 19:38:04 UTC (rev 32615)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-20 23:13:12 UTC (rev 32616)
@@ -453,11 +453,17 @@
 {
 	struct RecentFile *recent, *next_recent;
 	char name[FILE_MAXDIR+FILE_MAXFILE];
+	char *user_config_dir;
 	FILE *fp;
 	int i;
 
-	BLI_make_file_string("/", name, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_HISTORY_FILE);
+	/* will be NULL in background mode */
+	user_config_dir = BLI_get_folder_create(BLENDER_USER_CONFIG, NULL);
+	if(!user_config_dir)
+		return;
 
+	BLI_make_file_string("/", name, user_config_dir, BLENDER_HISTORY_FILE);
+
 	recent = G.recent_files.first;
 	/* refresh recent-files.txt of recent opened files, when current file was changed */
 	if(!(recent) || (strcmp(recent->filepath, G.main->name)!=0)) {





More information about the Bf-blender-cvs mailing list