diff options
author | Jenkins CI <jenkins@llarimar.marussy.com> | 2021-06-19 07:49:02 +0300 |
---|---|---|
committer | Jenkins CI <jenkins@llarimar.marussy.com> | 2021-06-19 07:49:02 +0300 |
commit | 10771cfd2e310bcfe01d8f8e4d44b588e0660822 (patch) | |
tree | 0918015340b4f59f86e0a5e591ba8f2b0a50d1bd | |
parent | Only call workspace_auto_back_and_forth when needed (diff) | |
parent | Override outputs with the workspace command (diff) | |
download | sway-10771cfd2e310bcfe01d8f8e4d44b588e0660822.tar.gz sway-10771cfd2e310bcfe01d8f8e4d44b588e0660822.tar.zst sway-10771cfd2e310bcfe01d8f8e4d44b588e0660822.zip |
Merge commit '97111f3e606c7c11dd418c275c3e7c2d69b68a06' into HEAD
-rw-r--r-- | sway/commands/workspace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index 67db08ff..1e4edb38 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c | |||
@@ -158,6 +158,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
158 | return cmd_results_new(CMD_FAILURE, | 158 | return cmd_results_new(CMD_FAILURE, |
159 | "Unable to allocate workspace output"); | 159 | "Unable to allocate workspace output"); |
160 | } | 160 | } |
161 | if (output_location + 1 < argc) { | ||
162 | list_free_items_and_destroy(wsc->outputs); | ||
163 | wsc->outputs = create_list(); | ||
164 | } | ||
161 | for (int i = output_location + 1; i < argc; ++i) { | 165 | for (int i = output_location + 1; i < argc; ++i) { |
162 | list_add(wsc->outputs, strdup(argv[i])); | 166 | list_add(wsc->outputs, strdup(argv[i])); |
163 | } | 167 | } |