diff --git a/src/cfgparse.y b/src/cfgparse.y index f67c8fd1..fd23597e 100644 --- a/src/cfgparse.y +++ b/src/cfgparse.y @@ -1001,10 +1001,25 @@ workspace: } DLOG("Should assign workspace %s to output %s\n", ws_name, $4); - struct Workspace_Assignment *assignment = scalloc(sizeof(struct Workspace_Assignment)); - assignment->name = ws_name; - assignment->output = $4; - TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments); + /* Check for earlier assignments of the same workspace so that we + * don’t have assignments of a single workspace to different + * outputs */ + struct Workspace_Assignment *assignment; + bool duplicate = false; + TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { + if (strcasecmp(assignment->name, ws_name) == 0) { + ELOG("You have a duplicate workspace assignment for workspace \"%s\"\n", + ws_name); + assignment->output = $4; + duplicate = true; + } + } + if (!duplicate) { + assignment = scalloc(sizeof(struct Workspace_Assignment)); + assignment->name = ws_name; + assignment->output = $4; + TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments); + } } } | TOKWORKSPACE NUMBER workspace_name