From 4fd0c66b90559ee9712ba98620db252b96451c2d Mon Sep 17 00:00:00 2001 From: John Rassa Date: Wed, 24 Oct 2018 16:19:27 -0700 Subject: [PATCH] allow variables in import elements --- es-core/src/ThemeData.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp index fe78e4cee..0f3b8d991 100644 --- a/es-core/src/ThemeData.cpp +++ b/es-core/src/ThemeData.cpp @@ -239,7 +239,7 @@ void ThemeData::parseIncludes(const pugi::xml_node& root) 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); if(!ResourceManager::getInstance()->fileExists(path)) throw error << "Included file \"" << relPath << "\" not found! (resolved to \"" << path << "\")";