Merge branch 'master' into sway-language-module

This commit is contained in:
nikto_b
2020-10-12 13:31:39 +03:00
committed by GitHub
5 changed files with 19 additions and 16 deletions

View File

@ -283,6 +283,8 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
return config_["format-icons"]["persistent"].asString();
} else if (config_["format-icons"][key].isString()) {
return config_["format-icons"][key].asString();
} else if (config_["format-icons"][trimWorkspaceName(key)].isString()) {
return config_["format-icons"][trimWorkspaceName(key)].asString();
}
}
return name;