sway

commit a7b3f29292cad029f010aa8b5fafb56b08ba4ed7
parent 93696b78ecbc31ec34be97ec26836efb74d359f0
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Tue, 26 Jun 2018 20:18:57 +1000

Remove incorrect assertion and supporting code

Children can exist when destroying a container, such as when destroying
the last output. Sway is not terminating in that case.

Diffstat:
M
include/sway/server.h
 | 
2
--
M
sway/main.c
 | 
1
-
M
sway/tree/container.c
 | 
9
---------

3 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/include/sway/server.h b/include/sway/server.h
@@ -47,8 +47,6 @@ struct sway_server {
 
 	bool debug_txn_timings;
 
-	bool terminating;
-
 	struct sway_transaction *head_transaction; // singly linked list
 
 	// When a view is being destroyed and is waiting for a transaction to
diff --git a/sway/main.c b/sway/main.c
@@ -34,7 +34,6 @@ struct sway_server server;
 void sway_terminate(int exit_code) {
 	terminate_request = true;
 	exit_value = exit_code;
-	server.terminating = true;
 	wl_display_terminate(server.wl_display);
 }
 
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -319,15 +319,6 @@ struct sway_container *container_destroy_noreaping(struct sway_container *con) {
 		}
 	}
 
-	// At this point the container being destroyed shouldn't have any children
-	// unless sway is terminating.
-	if (!server.terminating) {
-		if (!sway_assert(!con->children || con->children->length == 0,
-					"Didn't expect to see children here")) {
-			return NULL;
-		}
-	}
-
 	con->destroying = true;
 	list_add(server.destroying_containers, con);