Merge pull request #3278 from LukashonakV/ISSUE#3276_cava
commit
8ad7c75d79
|
@ -12,7 +12,12 @@ waybar::modules::Cava::Cava(const std::string& id, const Json::Value& config)
|
||||||
std::string strPath{config_["cava_config"].asString()};
|
std::string strPath{config_["cava_config"].asString()};
|
||||||
const std::string fnd{"XDG_CONFIG_HOME"};
|
const std::string fnd{"XDG_CONFIG_HOME"};
|
||||||
const std::string::size_type npos{strPath.find("$" + fnd)};
|
const std::string::size_type npos{strPath.find("$" + fnd)};
|
||||||
if (npos != std::string::npos) strPath.replace(npos, fnd.length() + 1, getenv(fnd.c_str()));
|
if (npos != std::string::npos) {
|
||||||
|
if (const char* xdg = getenv(fnd.c_str()))
|
||||||
|
strPath.replace(npos, fnd.length() + 1, xdg);
|
||||||
|
else
|
||||||
|
spdlog::warn("Module {0}. Environment variable \"${1}\" not found", name_, fnd);
|
||||||
|
}
|
||||||
strcpy(cfgPath, strPath.data());
|
strcpy(cfgPath, strPath.data());
|
||||||
}
|
}
|
||||||
// Load cava config
|
// Load cava config
|
||||||
|
|
Loading…
Reference in New Issue