summaryrefslogtreecommitdiff
path: root/sway/main.c
diff options
context:
space:
mode:
authoremersion <[email protected]>2018-11-28 09:26:47 +0100
committerGitHub <[email protected]>2018-11-28 09:26:47 +0100
commit048b96a56d3d3a817c7c63bce2f8226fffc88aa4 (patch)
tree13d0886bd0887aeaaa8d10b8c67ac63685544a8d /sway/main.c
parent60e1fb547cc763310f4d28a10a0c82a936714b94 (diff)
parent5c6f3d7266ab0c63015715f12c8e15eb144311a2 (diff)
Merge pull request #3204 from RedSoxFan/cmd-res-list
Change execute_command to return a list of results
Diffstat (limited to 'sway/main.c')
-rw-r--r--sway/main.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sway/main.c b/sway/main.c
index a21970e2..a74183fe 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -392,11 +392,16 @@ int main(int argc, char **argv) {
wlr_log(WLR_DEBUG, "Running deferred commands");
while (config->cmd_queue->length) {
char *line = config->cmd_queue->items[0];
- struct cmd_results *res = execute_command(line, NULL, NULL);
- if (res->status != CMD_SUCCESS) {
- wlr_log(WLR_ERROR, "Error on line '%s': %s", line, res->error);
+ list_t *res_list = execute_command(line, NULL, NULL);
+ while (res_list->length) {
+ struct cmd_results *res = res_list->items[0];
+ if (res->status != CMD_SUCCESS) {
+ wlr_log(WLR_ERROR, "Error on line '%s': %s", line, res->error);
+ }
+ free_cmd_results(res);
+ list_del(res_list, 0);
}
- free_cmd_results(res);
+ list_free(res_list);
free(line);
list_del(config->cmd_queue, 0);
}