From fdfbaaca25f2993adaad379c49d6ce19eb136e4c Mon Sep 17 00:00:00 2001 From: barrrguzin Date: Sat, 25 May 2024 13:32:07 +1000 Subject: [PATCH] fixed contain parameter handling in "handleReload" --- src/config/ConfigManager.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 522ee0b..6990ca6 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -130,14 +130,14 @@ static Hyprlang::CParseResult handleReload(const char* C, const char* V) { auto WALLPAPER = g_pConfigManager->trimPath(VALUE.substr(VALUE.find_first_of(',') + 1)); + if (WALLPAPER.find("contain:") == 0) { + WALLPAPER = WALLPAPER.substr(8); + } + auto preloadResult = handlePreload(C, WALLPAPER.c_str()); if (preloadResult.error) return preloadResult; - auto wallpaperResult = handleWallpaper(C, V); - if (wallpaperResult.error) - return wallpaperResult; - auto MONITOR = VALUE.substr(0, VALUE.find_first_of(',')); if (MONITOR.empty()) { @@ -150,6 +150,10 @@ static Hyprlang::CParseResult handleReload(const char* C, const char* V) { g_pHyprpaper->unloadWallpaper(OLD_WALLPAPER); } + auto wallpaperResult = handleWallpaper(C, V); + if (wallpaperResult.error) + return wallpaperResult; + return Hyprlang::CParseResult{}; }