X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftime.cpp;h=f9fae684fa5aa60543030d8eaab4a5be3b77c375;hb=99e2b11a81d17de6155de18e0c91ae5efe08613f;hp=0ef4cdbe250e870b9afc5ef0dc4954be98e4c16c;hpb=78aeb61398c711707f2f2e9131137df316221caf;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index 0ef4cdb..f9fae68 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -7,6 +7,8 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**  Copyright (c) 2008 Gerco Ballintijn
+**  Copyright (c) 2008 Carlos López
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -37,6 +39,7 @@
 #include <cmath>
 #include <cassert>
 #include <algorithm>
+#include <cstdio>
 #include <ctype.h>
 #include <math.h>
 
@@ -182,7 +185,7 @@ Time::get_string(float fps, Time::Format format)const
 	if(ceil(time.value_)-time.value_<epsilon_())
 		time.value_=ceil(time.value_);
 
-	int hour,minute;
+	int hour = 0, minute = 0;
 	if(!(format<=FORMAT_FRAMES))
 	{
 		hour=time/3600;time-=hour*3600;
@@ -247,7 +250,7 @@ Time::get_string(float fps, Time::Format format)const
 			started = true;
 		}
 
-		if(format<=FORMAT_FULL || frame || !started)
+		if(format<=FORMAT_FULL || abs(frame) > epsilon_() || !started)
 		{
 			if (!(format<=FORMAT_NOSPACES) && started)
 				ret += " ";