diff --git a/src/modules/niri/workspaces.cpp b/src/modules/niri/workspaces.cpp index 7dfc0b351..5d7d1f74e 100644 --- a/src/modules/niri/workspaces.cpp +++ b/src/modules/niri/workspaces.cpp @@ -174,17 +174,17 @@ std::string Workspaces::getIcon(const std::string &value, const Json::Value &ws) if (ws["is_urgent"].asBool() && icons["urgent"]) return icons["urgent"].asString(); + if (ws["name"]) { + const auto &name = ws["name"].asString(); + if (icons[name]) return icons[name].asString(); + } + if (ws["active_window_id"].isNull() && icons["empty"]) return icons["empty"].asString(); if (ws["is_focused"].asBool() && icons["focused"]) return icons["focused"].asString(); if (ws["is_active"].asBool() && icons["active"]) return icons["active"].asString(); - if (ws["name"]) { - const auto &name = ws["name"].asString(); - if (icons[name]) return icons[name].asString(); - } - const auto idx = ws["idx"].asString(); if (icons[idx]) return icons[idx].asString();