mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-25 07:35:38 +00:00
Fixed an issue where theme loading debug output would sometimes print incorrect paths when the configuration included files using variables
This commit is contained in:
parent
d27b0f85e3
commit
531c72cfb7
|
@ -1506,15 +1506,15 @@ ThemeData::ThemeCapability ThemeData::parseThemeCapabilities(const std::string&
|
|||
|
||||
void ThemeData::parseIncludes(const pugi::xml_node& root)
|
||||
{
|
||||
ThemeException error;
|
||||
error << "ThemeData::parseIncludes(): ";
|
||||
error.setFiles(mPaths);
|
||||
|
||||
// Check if there's an unsupported theme version tag.
|
||||
if (root.child("formatVersion") != nullptr)
|
||||
throw error << ": Unsupported <formatVersion> tag found";
|
||||
|
||||
for (pugi::xml_node node {root.child("include")}; node; node = node.next_sibling("include")) {
|
||||
ThemeException error;
|
||||
error << "ThemeData::parseIncludes(): ";
|
||||
error.setFiles(mPaths);
|
||||
|
||||
// Check if there's an unsupported theme version tag.
|
||||
if (root.child("formatVersion") != nullptr)
|
||||
throw error << ": Unsupported <formatVersion> tag found";
|
||||
|
||||
std::string relPath {resolvePlaceholders(node.text().as_string())};
|
||||
std::string path {Utils::FileSystem::resolveRelativePath(relPath, mPaths.back(), true)};
|
||||
|
||||
|
|
Loading…
Reference in a new issue