diff --git a/src/App/Extensions/ModuleLoader.cpp b/src/App/Extensions/ModuleLoader.cpp index 7768ec7..6cb7d70 100644 --- a/src/App/Extensions/ModuleLoader.cpp +++ b/src/App/Extensions/ModuleLoader.cpp @@ -26,9 +26,6 @@ void App::ModuleLoader::Configure() for (const auto& module : m_configurables) module->Reset(); - bool foundAny = false; - bool successAll = true; - Core::Vector configDirs; { @@ -43,13 +40,20 @@ void App::ModuleLoader::Configure() } } - if (ExtraConfigDirExists()) + if (!m_extraConfigDir.empty()) { configDirs.emplace_back(m_extraConfigDir); } + bool foundAny = false; + bool successAll = true; + std::error_code error; + for (const auto& configDir : configDirs) { + if (!std::filesystem::exists(configDir, error)) + continue; + auto configDirIt = std::filesystem::recursive_directory_iterator( configDir, std::filesystem::directory_options::follow_directory_symlink); diff --git a/src/App/Project.hpp b/src/App/Project.hpp index 6706227..f5d96de 100644 --- a/src/App/Project.hpp +++ b/src/App/Project.hpp @@ -12,5 +12,5 @@ constexpr auto Author = "psiberx"; constexpr auto NameW = L"ArchiveXL"; constexpr auto AuthorW = L"psiberx"; -constexpr auto Version = semver::from_string_noexcept("1.1.4").value(); +constexpr auto Version = semver::from_string_noexcept("1.1.5").value(); } diff --git a/xmake.lua b/xmake.lua index 6cffbb1..fb1dd36 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,7 +1,7 @@ set_xmakever("2.5.9") set_project("ArchiveXL") -set_version("1.1.4") +set_version("1.1.5") set_arch("x64") set_languages("cxx20", "cxx2a")