From 78aeb61398c711707f2f2e9131137df316221caf Mon Sep 17 00:00:00 2001 From: genete Date: Wed, 17 Sep 2008 20:27:17 +0000 Subject: [PATCH] Apply http://patches.synfig.org/r/4/: Fix bad time entry when format is set to FFf. Patch by dooglus git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2058 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/time.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp index 062b82a..0ef4cdb 100644 --- a/synfig-core/trunk/src/synfig/time.cpp +++ b/synfig-core/trunk/src/synfig/time.cpp @@ -183,10 +183,11 @@ Time::get_string(float fps, Time::Format format)const time.value_=ceil(time.value_); int hour,minute; - - hour=time/3600;time-=hour*3600; - minute=time/60;time-=minute*60; - + if(!(format<=FORMAT_FRAMES)) + { + hour=time/3600;time-=hour*3600; + minute=time/60;time-=minute*60; + } // <= is redefined, so this means "is the FORMAT_VIDEO bit set in the format?" if(format<=FORMAT_VIDEO) { -- 2.7.4