fix unload all

This commit is contained in:
vaxerski 2022-11-27 12:02:09 +00:00
parent 3571e20b55
commit 3293f37662

View file

@ -112,11 +112,6 @@ void CConfigManager::parseKeyword(const std::string& COMMAND, const std::string&
} }
void CConfigManager::handleWallpaper(const std::string& COMMAND, const std::string& VALUE) { void CConfigManager::handleWallpaper(const std::string& COMMAND, const std::string& VALUE) {
if (VALUE == "all") {
handleUnloadAll(COMMAND, VALUE);
return;
}
if (VALUE.find_first_of(',') == std::string::npos) { if (VALUE.find_first_of(',') == std::string::npos) {
parseError = "wallpaper failed (syntax)"; parseError = "wallpaper failed (syntax)";
return; return;
@ -171,6 +166,11 @@ void CConfigManager::handlePreload(const std::string& COMMAND, const std::string
void CConfigManager::handleUnload(const std::string& COMMAND, const std::string& VALUE) { void CConfigManager::handleUnload(const std::string& COMMAND, const std::string& VALUE) {
auto WALLPAPER = VALUE; auto WALLPAPER = VALUE;
if (VALUE == "all") {
handleUnloadAll(COMMAND, VALUE);
return;
}
if (WALLPAPER[0] == '~') { if (WALLPAPER[0] == '~') {
static const char* const ENVHOME = getenv("HOME"); static const char* const ENVHOME = getenv("HOME");
WALLPAPER = std::string(ENVHOME) + WALLPAPER.substr(1); WALLPAPER = std::string(ENVHOME) + WALLPAPER.substr(1);