sway

commit b6428f4751bd6df69d2ef17e628c0d28de1c0233
parent 2aa6d98c5a6d37c759e1e9cc84032a95fb193793
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 11 Aug 2018 10:28:05 -0400

Merge pull request #2451 from RyanDwyer/fix-ancestor-crash

Fix container_has_ancestor crash
Diffstat:
M
sway/tree/container.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -769,7 +769,7 @@ void container_for_each_descendant(struct sway_container *container,
 
 bool container_has_ancestor(struct sway_container *descendant,
 		struct sway_container *ancestor) {
-	while (descendant->type != C_ROOT) {
+	while (descendant && descendant->type != C_ROOT) {
 		descendant = descendant->parent;
 		if (descendant == ancestor) {
 			return true;