[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13808] trunk/blender/source/blender: fix for [#7899] Quit doesn't report failure to save quit.blend

Campbell Barton ideasman42 at gmail.com
Fri Feb 22 01:03:03 CET 2008


Revision: 13808
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13808
Author:   campbellbarton
Date:     2008-02-22 01:03:03 +0100 (Fri, 22 Feb 2008)

Log Message:
-----------
fix for [#7899] Quit doesn't report failure to save quit.blend

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/blender.c
    trunk/blender/source/blender/src/usiblender.c

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2008-02-21 23:19:06 UTC (rev 13807)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2008-02-22 00:03:03 UTC (rev 13808)
@@ -720,7 +720,7 @@
 
 	file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666);
 	if(file == -1) {
-		printf("Unable to save %s\n", str);
+		error("Unable to save %s, check you have permissions", str);
 		return;
 	}
 
@@ -732,7 +732,7 @@
 	
 	close(file);
 	
-	if(chunk) printf("Unable to save %s\n", str);
+	if(chunk) error("Unable to save %s, internal error", str);
 	else printf("Saved session recovery to %s\n", str);
 }
 

Modified: trunk/blender/source/blender/src/usiblender.c
===================================================================
--- trunk/blender/source/blender/src/usiblender.c	2008-02-21 23:19:06 UTC (rev 13807)
+++ trunk/blender/source/blender/src/usiblender.c	2008-02-22 00:03:03 UTC (rev 13808)
@@ -1086,6 +1086,12 @@
 	quicktime_exit();
 #endif
 
+	/* undo free stuff */
+	undo_editmode_clear();
+	
+	BKE_undo_save_quit();	// saves quit.blend if global undo is on
+	BKE_reset_undo(); 
+	
 	if (!G.background) {
 		BIF_resources_free();
 		
@@ -1102,12 +1108,7 @@
 	if (copybuf) MEM_freeN(copybuf);
 	if (copybufinfo) MEM_freeN(copybufinfo);
 
-	/* undo free stuff */
-	undo_editmode_clear();
-	
-	BKE_undo_save_quit();	// saves quit.blend if global undo is on
-	BKE_reset_undo(); 
-	
+// 	
 	BLI_freelistN(&U.themes);
 	BIF_preview_free_dbase();
 	





More information about the Bf-blender-cvs mailing list