diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-19 08:59:00 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-19 08:59:00 +1000 |
commit | 373f0254a8d28511897e19ada1487b9115fc2019 (patch) | |
tree | 50564536b73fac3147186ff2c562289df8a4b3f2 | |
parent | Merge pull request #2473 from RyanDwyer/iterators-per-type (diff) | |
parent | Fix double iterating in container_for_each_child (diff) | |
download | sway-373f0254a8d28511897e19ada1487b9115fc2019.tar.gz sway-373f0254a8d28511897e19ada1487b9115fc2019.tar.zst sway-373f0254a8d28511897e19ada1487b9115fc2019.zip |
Merge pull request #2484 from ianyfan/con-for-each-child-fix
Fix double iterating in container_for_each_child
-rw-r--r-- | sway/tree/container.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 1ceae175..9bc4f544 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -737,10 +737,10 @@ void container_for_each_child(struct sway_container *container, | |||
737 | container->type == C_VIEW, "Expected a container or view")) { | 737 | container->type == C_VIEW, "Expected a container or view")) { |
738 | return; | 738 | return; |
739 | } | 739 | } |
740 | f(container, data); | ||
741 | if (container->children) { | 740 | if (container->children) { |
742 | for (int i = 0; i < container->children->length; ++i) { | 741 | for (int i = 0; i < container->children->length; ++i) { |
743 | struct sway_container *child = container->children->items[i]; | 742 | struct sway_container *child = container->children->items[i]; |
743 | f(child, data); | ||
744 | container_for_each_child(child, f, data); | 744 | container_for_each_child(child, f, data); |
745 | } | 745 | } |
746 | } | 746 | } |