X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_timestring.cpp;h=d5f643578e0e5415be5877b901d22415cf168c27;hb=662aa088c1710830ff30e4ff0b1b407a6d2cea4e;hp=019871684c8e2a8df94773481e11181bbef98c6a;hpb=b9a14d1642ddddb939a0f823ecd9089bb3e1fede;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_timestring.cpp b/synfig-core/trunk/src/synfig/valuenode_timestring.cpp
index 0198716..d5f6435 100644
--- a/synfig-core/trunk/src/synfig/valuenode_timestring.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timestring.cpp
@@ -57,7 +57,7 @@ ValueNode_TimeString::ValueNode_TimeString(const ValueBase &value):
 	switch(value.get_type())
 	{
 	case ValueBase::TYPE_STRING:
-		set_link("time",ValueNode_Const::create(Time()));
+		set_link("time",ValueNode_Const::create(Time(0)));
 		break;
 	default:
 		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
@@ -91,7 +91,10 @@ ValueNode_TimeString::operator()(Time t)const
 	switch (get_type())
 	{
 	case ValueBase::TYPE_STRING:
-		return time.get_string(get_parent_canvas()->rend_desc().get_frame_rate());
+		if (get_root_canvas())
+			return time.get_string(get_root_canvas()->rend_desc().get_frame_rate());
+		else
+			return time.get_string();
 	default:
 		break;
 	}