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

config/legacy: fix missing fallbacks crashing device getters

Browse source
This commit is contained in:
Vaxry 2026-05-06 21:04:33 +01:00 • committed by Vaxry
parent ae0eeea114
commit 74ed271d0f
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1118,20 +1118,36 @@ bool CConfigManager::deviceConfigExplicitlySet(const std::string& dev, const std
}
int CConfigManager::getDeviceInt(const std::string& dev, const std::string& v, const std::string& fallback) {
return std::any_cast<Hyprlang::INT>(getConfigValueSafeDevice(dev, v, fallback)->getValue());
auto val = getConfigValueSafeDevice(dev, v, fallback);
if (!val)
return {};
return std::any_cast<Hyprlang::INT>(val->getValue());
}
float CConfigManager::getDeviceFloat(const std::string& dev, const std::string& v, const std::string& fallback) {
return std::any_cast<Hyprlang::FLOAT>(getConfigValueSafeDevice(dev, v, fallback)->getValue());
auto val = getConfigValueSafeDevice(dev, v, fallback);
if (!val)
return {};
return std::any_cast<Hyprlang::FLOAT>(val->getValue());
}
Vector2D CConfigManager::getDeviceVec(const std::string& dev, const std::string& v, const std::string& fallback) {
auto vec = std::any_cast<Hyprlang::VEC2>(getConfigValueSafeDevice(dev, v, fallback)->getValue());
auto val = getConfigValueSafeDevice(dev, v, fallback);
if (!val)
return {};
auto vec = std::any_cast<Hyprlang::VEC2>(val->getValue());
return {vec.x, vec.y};
}
std::string CConfigManager::getDeviceString(const std::string& dev, const std::string& v, const std::string& fallback) {
auto VAL = std::string{std::any_cast<Hyprlang::STRING>(getConfigValueSafeDevice(dev, v, fallback)->getValue())};
auto val = getConfigValueSafeDevice(dev, v, fallback);
if (!val)
return "";
auto VAL = std::string{std::any_cast<Hyprlang::STRING>(val->getValue())};
if (VAL == STRVAL_EMPTY)
return "";