mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 13:04:09 +02:00
Don't lookup node texts in a endless recursion loop
This commit is contained in:
parent
0fd5c61c00
commit
6f661f77a6
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user