X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=ea59b8e1ddae4696ec5abfe8c2d5b299d2ca0640;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=eb4dd501d744d29cb75d747d277b3cf68ff647ef;hpb=39116040c58584133510f3af12456f8f8e055e3c;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index eb4dd50..ea59b8e 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.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
@@ -215,7 +215,10 @@ Time::get_string(float fps, Time::Format format)const
 
 	if(format<=FORMAT_FULL || minute)
 	{
-		ret+=strprintf(format<=FORMAT_NOSPACES||!started?"%dm":" %dm",minute);
+		if (!(format<=FORMAT_NOSPACES) && started)
+			ret += " ";
+
+		ret += strprintf("%dm", minute);
 		started = true;
 	}
 
@@ -225,18 +228,25 @@ Time::get_string(float fps, Time::Format format)const
 		float frame;
 		second=time;time-=second;
 		frame=time*fps;
+
 		if(format<=FORMAT_FULL || second)
 		{
-			ret+=strprintf(format<=FORMAT_NOSPACES||!started?"%ds":" %ds",(int)second);
+			if (!(format<=FORMAT_NOSPACES) && started)
+				ret += " ";
+
+			ret += strprintf("%ds", (int)second);
 			started = true;
 		}
 
 		if(format<=FORMAT_FULL || frame || !started)
 		{
-			if(abs(frame-floor(frame)>=epsilon_()))
-				ret+=strprintf(format<=FORMAT_NOSPACES||!started?"%0.3ff":" %0.3ff",frame);
+			if (!(format<=FORMAT_NOSPACES) && started)
+				ret += " ";
+
+			if(abs(frame-floor(frame) >= epsilon_()))
+				ret += strprintf("%0.3ff", frame);
 			else
-				ret+=strprintf(format<=FORMAT_NOSPACES||!started?"%0.0ff":" %0.0ff",frame);
+				ret += strprintf("%0.0ff", frame);
 		}
 	}
 	else
@@ -245,6 +255,9 @@ Time::get_string(float fps, Time::Format format)const
 		second=time;
 		if(format<=FORMAT_FULL || second || !started)
 		{
+			if (!(format<=FORMAT_NOSPACES) && started)
+				ret += " ";
+
 			if(abs(second-floor(second))>=epsilon_())
 			{
 				String seconds(strprintf("%0.8f",second));