diff options
-rw-r--r-- | include/sway/server.h | 2 | ||||
-rw-r--r-- | sway/main.c | 1 | ||||
-rw-r--r-- | sway/tree/container.c | 9 |
3 files changed, 0 insertions, 12 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 94e8f2a2..bd96b085 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -47,8 +47,6 @@ struct sway_server { | |||
47 | 47 | ||
48 | bool debug_txn_timings; | 48 | bool debug_txn_timings; |
49 | 49 | ||
50 | bool terminating; | ||
51 | |||
52 | struct sway_transaction *head_transaction; // singly linked list | 50 | struct sway_transaction *head_transaction; // singly linked list |
53 | 51 | ||
54 | // When a view is being destroyed and is waiting for a transaction to | 52 | // When a view is being destroyed and is waiting for a transaction to |
diff --git a/sway/main.c b/sway/main.c index 61ae6a5f..a325dc3a 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -34,7 +34,6 @@ struct sway_server server; | |||
34 | void sway_terminate(int exit_code) { | 34 | void sway_terminate(int exit_code) { |
35 | terminate_request = true; | 35 | terminate_request = true; |
36 | exit_value = exit_code; | 36 | exit_value = exit_code; |
37 | server.terminating = true; | ||
38 | wl_display_terminate(server.wl_display); | 37 | wl_display_terminate(server.wl_display); |
39 | } | 38 | } |
40 | 39 | ||
diff --git a/sway/tree/container.c b/sway/tree/container.c index 0c860405..2b9eb636 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -319,15 +319,6 @@ struct sway_container *container_destroy_noreaping(struct sway_container *con) { | |||
319 | } | 319 | } |
320 | } | 320 | } |
321 | 321 | ||
322 | // At this point the container being destroyed shouldn't have any children | ||
323 | // unless sway is terminating. | ||
324 | if (!server.terminating) { | ||
325 | if (!sway_assert(!con->children || con->children->length == 0, | ||
326 | "Didn't expect to see children here")) { | ||
327 | return NULL; | ||
328 | } | ||
329 | } | ||
330 | |||
331 | con->destroying = true; | 322 | con->destroying = true; |
332 | list_add(server.destroying_containers, con); | 323 | list_add(server.destroying_containers, con); |
333 | 324 | ||