X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=b751e8e0ba781b50f3ff238a0f4c0e716bfe8932;hb=2f30f664764cd4e2908d3465197c680b9ed2145d;hp=4edc8afe66189764326a0f25d78e1779a3cda07c;hpb=3466ac128d391d253a605e3357cee30fcadb2cf1;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index 4edc8af..b751e8e 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -101,7 +101,7 @@ Time::Time(const String &str_, float fps):
 	int read;
 	float amount;
 
-	// Now try to read it in the letter-abreviated format
+	// Now try to read it in the letter-abbreviated format
 	while(pos<str.size() && sscanf(String(str,pos).c_str(),"%f%n",&amount,&read))
 	{
 		pos+=read;
@@ -193,7 +193,7 @@ Time::get_string(float fps, Time::Format format)const
 		int second;
 		second=time;time-=second;
 
-		if(fps)
+		if(fps && fps>1)
 		{
 			int frame;
 			frame=round_to_int(time*fps);
@@ -219,7 +219,7 @@ Time::get_string(float fps, Time::Format format)const
 		started = true;
 	}
 
-	if(fps)
+	if(fps && fps>1)
 	{
 		int second;
 		float frame;
@@ -246,7 +246,19 @@ Time::get_string(float fps, Time::Format format)const
 		if(format<=FORMAT_FULL || second || !started)
 		{
 			if(abs(second-floor(second))>=epsilon_())
-				ret+=strprintf("%0.8fs",second);
+			{
+				String seconds(strprintf("%0.8f",second));
+
+				// skip trailing zeros
+				int count = 0;
+				for (String::reverse_iterator i = seconds.rbegin(); (*i) == '0'; i++)
+					count++;
+
+				// if we removed too many, go back one place, leaving one zero
+				if (*i < '0' || *i > '9') count--;
+
+				ret += seconds.substr(0, seconds.size()-count) + "s";
+			}
 			else
 				ret+=strprintf("%0.0fs",second);
 		}