diff --git a/src/config/WallpaperMatcher.cpp b/src/config/WallpaperMatcher.cpp index 3c67f36..1d6916d 100644 --- a/src/config/WallpaperMatcher.cpp +++ b/src/config/WallpaperMatcher.cpp @@ -65,6 +65,8 @@ std::optional> CWallpaperM std::optional> CWallpaperMatcher::matchSetting(const std::string_view& monName, const std::string_view& monDesc) { // match explicit for (const auto& s : m_settings) { + if (isWildcard(s.monitor)) + continue; if (s.monitor != monName && !("desc:"s + std::string{monDesc}).starts_with(s.monitor)) continue; return s; @@ -96,7 +98,7 @@ void CWallpaperMatcher::recalcStates() { auto& activeState = getState(name); if (!STATE) - activeState = {.name = name, .desc = desc}; + activeState = {.name = name, .desc = desc, .currentID = CConfigManager::SETTING_INVALID}; else { activeState.name = name; activeState.desc = desc;