aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-08-11 10:28:05 -0400
committerLibravatar GitHub <noreply@github.com>2018-08-11 10:28:05 -0400
commitb6428f4751bd6df69d2ef17e628c0d28de1c0233 (patch)
tree795fe72b9de75bc7fae93b72d7c470d170d97b0d
parentMerge pull request #2449 from RyanDwyer/remove-bfs (diff)
parentFix container_has_ancestor crash (diff)
downloadsway-b6428f4751bd6df69d2ef17e628c0d28de1c0233.tar.gz
sway-b6428f4751bd6df69d2ef17e628c0d28de1c0233.tar.zst
sway-b6428f4751bd6df69d2ef17e628c0d28de1c0233.zip
Merge pull request #2451 from RyanDwyer/fix-ancestor-crash
Fix container_has_ancestor crash
-rw-r--r--sway/tree/container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 435d71e2..45e54080 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -769,7 +769,7 @@ void container_for_each_descendant(struct sway_container *container,
769 769
770bool container_has_ancestor(struct sway_container *descendant, 770bool container_has_ancestor(struct sway_container *descendant,
771 struct sway_container *ancestor) { 771 struct sway_container *ancestor) {
772 while (descendant->type != C_ROOT) { 772 while (descendant && descendant->type != C_ROOT) {
773 descendant = descendant->parent; 773 descendant = descendant->parent;
774 if (descendant == ancestor) { 774 if (descendant == ancestor) {
775 return true; 775 return true;