Merge pull request #16 from pinnouse/main

Allow parsing home dir with contains keyword
This commit is contained in:
Vaxry 2022-11-01 20:03:49 +00:00 committed by GitHub
commit 707ae57d44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -122,16 +122,16 @@ void CConfigManager::handleWallpaper(const std::string& COMMAND, const std::stri
bool contain = false;
if (WALLPAPER[0] == '~') {
static const char* const ENVHOME = getenv("HOME");
WALLPAPER = std::string(ENVHOME) + WALLPAPER.substr(1);
}
if (WALLPAPER.find("contain:") == 0) {
WALLPAPER = WALLPAPER.substr(8);
contain = true;
}
if (WALLPAPER[0] == '~') {
static const char* const ENVHOME = getenv("HOME");
WALLPAPER = std::string(ENVHOME) + WALLPAPER.substr(1);
}
if (!std::filesystem::exists(WALLPAPER)) {
parseError = "wallpaper failed (no such file)";
return;