From 148b113b8d0df71fa20f6a269118624f7d29fb49 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 27 Aug 2018 00:18:20 -0400 Subject: [PATCH] Destroy empty workspaces in output_evacuate --- sway/tree/output.c | 9 +++++++-- 1 file 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);