diff options
author | emersion <contact@emersion.fr> | 2018-11-28 09:26:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-28 09:26:47 +0100 |
commit | 048b96a56d3d3a817c7c63bce2f8226fffc88aa4 (patch) | |
tree | 13d0886bd0887aeaaa8d10b8c67ac63685544a8d /sway/tree/view.c | |
parent | Merge pull request #3209 from RedSoxFan/fix-3146 (diff) | |
parent | Change execute_command to return a list of results (diff) | |
download | sway-048b96a56d3d3a817c7c63bce2f8226fffc88aa4.tar.gz sway-048b96a56d3d3a817c7c63bce2f8226fffc88aa4.tar.zst sway-048b96a56d3d3a817c7c63bce2f8226fffc88aa4.zip |
Merge pull request #3204 from RedSoxFan/cmd-res-list
Change execute_command to return a list of results
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index febba3b9..511c2ecc 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -437,9 +437,14 @@ void view_execute_criteria(struct sway_view *view) { | |||
437 | wlr_log(WLR_DEBUG, "for_window '%s' matches view %p, cmd: '%s'", | 437 | wlr_log(WLR_DEBUG, "for_window '%s' matches view %p, cmd: '%s'", |
438 | criteria->raw, view, criteria->cmdlist); | 438 | criteria->raw, view, criteria->cmdlist); |
439 | list_add(view->executed_criteria, criteria); | 439 | list_add(view->executed_criteria, criteria); |
440 | struct cmd_results *res = execute_command( | 440 | list_t *res_list = execute_command( |
441 | criteria->cmdlist, NULL, view->container); | 441 | criteria->cmdlist, NULL, view->container); |
442 | free_cmd_results(res); | 442 | while (res_list->length) { |
443 | struct cmd_results *res = res_list->items[0]; | ||
444 | free_cmd_results(res); | ||
445 | list_del(res_list, 0); | ||
446 | } | ||
447 | list_free(res_list); | ||
443 | } | 448 | } |
444 | list_free(criterias); | 449 | list_free(criterias); |
445 | } | 450 | } |