Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #494 from jrassa/variables-in-imports

Browse source 
allow variables in import elements
This commit is contained in:
Jools Wills 2018-10-26 03:57:31 +01:00 committed by GitHub
parent e59e63828b 4fd0c66b90
commit 5af905e2c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-core/src/ThemeData.cpp
View file

@ -248,7 +248,7 @@ void ThemeData::parseIncludes(const pugi::xml_node& root)
for(pugi::xml_node node = root.child("include"); node; node = node.next_sibling("include")) for(pugi::xml_node node = root.child("include"); node; node = node.next_sibling("include"))
{ {
const char* relPath = node.text().get(); std::string relPath = resolvePlaceholders(node.text().as_string());
std::string path = Utils::FileSystem::resolveRelativePath(relPath, mPaths.back(), true); std::string path = Utils::FileSystem::resolveRelativePath(relPath, mPaths.back(), true);
if(!ResourceManager::getInstance()->fileExists(path)) if(!ResourceManager::getInstance()->fileExists(path))
throw error << "Included file \"" << relPath << "\" not found! (resolved to \"" << path << "\")"; throw error << "Included file \"" << relPath << "\" not found! (resolved to \"" << path << "\")";