diff options
| author | S. Christoffer Eliesen <[email protected]> | 2015-11-19 13:05:59 +0100 |
|---|---|---|
| committer | S. Christoffer Eliesen <[email protected]> | 2015-11-22 11:08:08 +0100 |
| commit | 5531dbe1b2026a88670c812d40f0efccb4b52c7f (patch) | |
| tree | 793b93d9df55478856a9d6dda7d99d3f8bd7d0e7 /sway/commands.c | |
| parent | d0af224e6da2505601b9c068912903b3d32e37c6 (diff) | |
cmd_workspace: Don't fill up config->workspace_outputs with duplicates.
This also fixes a bug where issuing a new "workspace a output b" command
for an already assigned workspace would not work (the old config would
be found first and used instead).
Diffstat (limited to 'sway/commands.c')
| -rw-r--r-- | sway/commands.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index 173f0f53..7f24f5ab 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1318,9 +1318,15 @@ static struct cmd_results *cmd_workspace(int argc, char **argv) { return error; } struct workspace_output *wso = calloc(1, sizeof(struct workspace_output)); - sway_log(L_DEBUG, "Assigning workspace %s to output %s", argv[0], argv[2]); wso->workspace = strdup(argv[0]); wso->output = strdup(argv[2]); + int i = -1; + if ((i = list_seq_find(config->workspace_outputs, workspace_output_cmp_workspace, wso)) != -1) { + struct workspace_output *old = config->workspace_outputs->items[i]; + free(old); // workspaces can only be assigned to a single output + list_del(config->workspace_outputs, i); + } + sway_log(L_DEBUG, "Assigning workspace %s to output %s", argv[0], argv[2]); list_add(config->workspace_outputs, wso); if (!config->reading) { // TODO: Move workspace to output. (dont do so when reloading) |