hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2026-05-07 06:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

config: fix safe mode config generation (#14024)

Browse source
This commit is contained in:
Vaxry 2026-04-13 22:19:37 +01:00 • committed by GitHub
parent 933a24caa6
commit e539d21174
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/config/ConfigManager.cpp
View file

@ -36,12 +36,6 @@ bool Config::initConfigManager() {
Log::logger->log(Log::CRIT, "Couldn't load config: {}", ec.message());
return false;
}
// generate default
if (const auto v = g_mgr->generateDefaultConfig(filePath); !v) {
Log::logger->log(Log::CRIT, "Couldn't generate default config: {}", v.error());
return false;
}
}
return true;

15
src/config/legacy/ConfigManager.cpp
View file

@ -987,8 +987,19 @@ void CConfigManager::reloadRuleConfigs() {
std::optional<std::string> CConfigManager::verifyConfigExists() {
auto mainConfigPath = Supplementary::Jeremy::getMainConfigPath();
if (!mainConfigPath || !std::filesystem::exists(*mainConfigPath))
return "broken config dir?";
if (!mainConfigPath)
return "Broken config directory";
std::error_code ec;
const bool VALID_CFG = std::filesystem::exists(*mainConfigPath, ec) && !ec;
if (!VALID_CFG && !g_pCompositor->m_explicitConfigPath.empty())
return "Invalid config file provided as explicit";
if (!VALID_CFG) {
if (const auto res = generateDefaultConfig(*mainConfigPath, g_pCompositor->m_safeMode); !res)
return res.error();
}
return {};
}