X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=5f184737c3f58733dd821f72e4c598c82cb8e398;hb=c8833dd28d1b06713e91f1f069e93f0fbfa6c971;hp=d0cb3cdc2c70b5767c3ff1031819eff1aae2304b;hpb=933391e568dac0fa4409875800a331d219fe9b59;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index d0cb3cd..5f18473 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -768,29 +768,28 @@ synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 		encode_canvas_toplevel(document.create_root_node("canvas"),canvas);
 
 		document.write_to_file_formatted(tmp_filename);
-	}
-	catch(...) { synfig::error("synfig::save_canvas(): Caught unknown exception"); return false; }
-
 
 #ifdef _WIN32
-	// On Win32 platforms, rename() has bad behavior. work around it.
-	char old_file[80]="sif.XXXXXXXX";
-	mktemp(old_file);
-	rename(filename.c_str(),old_file);
-	if(rename(tmp_filename.c_str(),filename.c_str())!=0)
-	{
-		rename(old_file,tmp_filename.c_str());
-		synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
-		return false;
-	}
-	remove(old_file);
+		// On Win32 platforms, rename() has bad behavior. work around it.
+		char old_file[80]="sif.XXXXXXXX";
+		mktemp(old_file);
+		rename(filename.c_str(),old_file);
+		if(rename(tmp_filename.c_str(),filename.c_str())!=0)
+		{
+			rename(old_file,tmp_filename.c_str());
+			synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
+			return false;
+		}
+		remove(old_file);
 #else
-	if(rename(tmp_filename.c_str(),filename.c_str())!=0)
-	{
-		synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
-		return false;
-	}
+		if(rename(tmp_filename.c_str(),filename.c_str())!=0)
+		{
+			synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
+			return false;
+		}
 #endif
+	}
+	catch(...) { synfig::error("synfig::save_canvas(): Caught unknown exception"); return false; }
 
 	return true;
 }