summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2017-03-08 14:35:11 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2017-03-13 23:15:39 -0400
commite221d28df770f5b16ce6663d1ef6f5b66a5423f4 (patch)
treef1df1b5613a920d8bfb8ec278a32329afb01e55e
parentMerge pull request #1113 from johnchen902/patch-1 (diff)
downloadsway-e221d28df770f5b16ce6663d1ef6f5b66a5423f4.tar.gz
sway-e221d28df770f5b16ce6663d1ef6f5b66a5423f4.tar.zst
sway-e221d28df770f5b16ce6663d1ef6f5b66a5423f4.zip
Merge pull request #1105 from zandrmartin/fix-workspace-output-assignment0.12.1
fix workspace output assignment
-rw-r--r--sway/commands/workspace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 7db1f332..b49a3a69 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -31,7 +31,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
31 "Unable to allocate workspace output"); 31 "Unable to allocate workspace output");
32 } 32 }
33 wso->workspace = join_args(argv, argc - 2); 33 wso->workspace = join_args(argv, argc - 2);
34 wso->output = strdup(argv[output_location]); 34 wso->output = strdup(argv[output_location + 1]);
35 int i = -1; 35 int i = -1;
36 if ((i = list_seq_find(config->workspace_outputs, workspace_output_cmp_workspace, wso)) != -1) { 36 if ((i = list_seq_find(config->workspace_outputs, workspace_output_cmp_workspace, wso)) != -1) {
37 struct workspace_output *old = config->workspace_outputs->items[i]; 37 struct workspace_output *old = config->workspace_outputs->items[i];