Don't lookup node texts in a endless recursion loop

sapier · sapier · commit 6f661f77a697 · 2014-01-07T11:15:24.000+01:00
diff --git a/src/nodemetadata.h b/src/nodemetadata.h
@@ -55,7 +55,7 @@ class NodeMetadata
 		i = m_stringvars.find(name);
 		if(i == m_stringvars.end())
 			return "";
-		return resolveString(i->second);
+		return i->second;
 	}
 	void setString(const std::string &name, const std::string &var)
 	{
@@ -68,7 +68,7 @@ class NodeMetadata
 	std::string resolveString(const std::string &str) const
 	{
 		if(str.substr(0,2) == "${" && str[str.length()-1] == '}')
-			return resolveString(getString(str.substr(2,str.length()-3)));
+			return getString(str.substr(2,str.length()-3));
 		return str;
 	}
 	std::map<std::string, std::string> getStrings() const

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class NodeMetadata`
`55`	`55`	`i = m_stringvars.find(name);`
`56`	`56`	`if(i == m_stringvars.end())`
`57`	`57`	`return "";`
`58`		`- return resolveString(i->second);`
	`58`	`+ return i->second;`
`59`	`59`	`}`
`60`	`60`	`void setString(const std::string &name, const std::string &var)`
`61`	`61`	`{`
`@@ -68,7 +68,7 @@ class NodeMetadata`
`68`	`68`	`std::string resolveString(const std::string &str) const`
`69`	`69`	`{`
`70`	`70`	`if(str.substr(0,2) == "${" && str[str.length()-1] == '}')`
`71`		`- return resolveString(getString(str.substr(2,str.length()-3)));`
	`71`	`+ return getString(str.substr(2,str.length()-3));`
`72`	`72`	`return str;`
`73`	`73`	`}`
`74`	`74`	`std::map<std::string, std::string> getStrings() const`