When appending a layout containing a marked container, make sure that any other conta...

[i3/i3] / src / load_layout.c

diff --git a/src/load_layout.c b/src/load_layout.c
index e0dc4fa01c7dda210bd8e50e6a0cd1f95b725101..4a67e6b1fe1828883329004597186c3ca921ae9f 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -338,6 +338,10 @@ static int json_string(void *ctx, const unsigned char *val, size_t len) {
         } else if (strcasecmp(last_key, "mark") == 0) {
             char *buf = NULL;
             sasprintf(&buf, "%.*s", (int)len, val);
+
+            /* We unmark any containers using this mark to avoid duplicates. */
+            con_unmark(buf);
+
             json_node->mark = buf;
         } else if (strcasecmp(last_key, "floating") == 0) {
             char *buf = NULL;