hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 16:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: report errors from sourced files

Browse source
This commit is contained in:
Vaxry 2024-03-11 01:39:00 +00:00
parent 220144276b
commit 66330281ff
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/config/ConfigManager.cpp
View file

@ -2243,6 +2243,8 @@ std::optional<std::string> CConfigManager::handleSource(const std::string& comma
return err; return err;
} }
std::string errorsFromParsing;
for (size_t i = 0; i < glob_buf->gl_pathc; i++) { for (size_t i = 0; i < glob_buf->gl_pathc; i++) {
auto value = absolutePath(glob_buf->gl_pathv[i], configCurrentPath); auto value = absolutePath(glob_buf->gl_pathv[i], configCurrentPath);
@ -2268,12 +2270,17 @@ std::optional<std::string> CConfigManager::handleSource(const std::string& comma
auto configCurrentPathBackup = configCurrentPath; auto configCurrentPathBackup = configCurrentPath;
configCurrentPath = value; configCurrentPath = value;
m_pConfig->parseFile(value.c_str()); const auto THISRESULT = m_pConfig->parseFile(value.c_str());
configCurrentPath = configCurrentPathBackup; configCurrentPath = configCurrentPathBackup;
if (THISRESULT.error && errorsFromParsing.empty())
errorsFromParsing += THISRESULT.getError();
} }
if (errorsFromParsing.empty())
return {}; return {};
return errorsFromParsing;
} }
std::optional<std::string> CConfigManager::handleEnv(const std::string& command, const std::string& value) { std::optional<std::string> CConfigManager::handleEnv(const std::string& command, const std::string& value) {