From 6347ec9a3d3a3959bb9acbc6954ad8f2a17514a7 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 21 Mar 2023 17:22:17 +0100 Subject: [PATCH] Any theme directories with names ending with disabled (regardless of case) are now ignored --- es-core/src/ThemeData.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp index 60342c628..361311761 100644 --- a/es-core/src/ThemeData.cpp +++ b/es-core/src/ThemeData.cpp @@ -803,6 +803,13 @@ void ThemeData::populateThemeSets() for (Utils::FileSystem::StringList::const_iterator it = dirContent.cbegin(); it != dirContent.cend(); ++it) { if (Utils::FileSystem::isDirectory(*it)) { + const std::string themeDirName {Utils::FileSystem::getFileName(*it)}; + if (themeDirName == "themes-list" || + (themeDirName.length() >= 8 && + Utils::String::toLower(themeDirName.substr(themeDirName.length() - 8, 8)) == + "disabled")) + continue; + #if defined(_WIN64) LOG(LogDebug) << "Loading theme set capabilities for \"" << Utils::String::replace(*it, "/", "\\") << "\"...";