Merge pull request #5072 from Lege19/master

(Fix) (sway workspace module) persistent workspaces always removed
2026-07-03 20:59:05 +02:00
parent fce96987e1 555dcb1776
commit c8bcbfb057
1 changed files with 4 additions and 1 deletions
@@ -229,7 +229,10 @@ bool Workspaces::filterButtons() {
    auto ws = std::find_if(workspaces_.begin(), workspaces_.end(),
                           [it](const auto& node) { return node["name"].asString() == it->first; });
    if (ws == workspaces_.end() ||
-        (!config_["all-outputs"].asBool() && (*ws)["output"].asString() != bar_.output->name)) {
+        ((*ws).isMember("target_output") ? (*ws)["target_output"].asString() != bar_.output->name &&
+                                               (*ws)["target_output"].asString() != ""
+                                         : !config_["all-outputs"].asBool() &&
+                                               (*ws)["output"].asString() != bar_.output->name)) {
      it = buttons_.erase(it);
      needReorder = true;
    } else {