From: sapier <Sapier at GMX dot net>
Date: Tue, 7 Jan 2014 10:15:24 +0000 (+0100)
Subject: Don't lookup node texts in a endless recursion loop
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=6f661f77a697a9ab3c8488214844f728f1e61daa;p=zefram%2Fminetest%2Fminetest_engine.git

Don't lookup node texts in a endless recursion loop
---

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index ce2c9e6d..71027050 100644
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -55,7 +55,7 @@ public:
 		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 @@ public:
 	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