Merge pull request #2520 from RedSoxFan/destroy-empty-ws-on-evac

Destroy empty workspaces in output_evacuate

1 files changed, 7 insertions, 2 deletions

diff --git a/sway/tree/output.c b/sway/tree/output.c
index bfc9c723..6601220b 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -128,14 +128,19 @@ static void output_evacuate(struct sway_container *output) {
 	while (output->children->length) {
 		struct sway_container *workspace = output->children->items[0];
 
+		container_remove_child(workspace);
+
+		if (workspace_is_empty(workspace)) {
+			workspace_begin_destroy(workspace);
+			continue;
+		}
+
 		struct sway_container *new_output =
 			workspace_output_get_highest_available(workspace, output);
 		if (!new_output) {
 			new_output = fallback_output;
 		}
 
-		container_remove_child(workspace);
-
 		if (new_output) {
 			workspace_output_add_priority(workspace, new_output);
 			container_add_child(new_output, workspace);