Handle the removal of non-empty desktops

baskerville · Sep 11, 2017 · a464968 · a464968
1 parent e621b98
commit a464968
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/messages.c b/src/messages.c
@@ -737,8 +737,11 @@ void cmd_desktop(char **args, int num, FILE *rsp)
 				fail(rsp, "desktop %s: Trailing commands.\n", *args);
 				break;
 			}
-			if (trg.desktop->root == NULL &&
-			    trg.monitor->desk_head != trg.monitor->desk_tail) {
+			if (trg.monitor->desk_head != trg.monitor->desk_tail) {
+				desktop_t *fallback = trg.desktop->prev == NULL ?
+				                      trg.desktop->next :
+				                      trg.desktop->prev;
+				merge_desktops(trg.monitor, trg.desktop, trg.monitor, fallback);
 				remove_desktop(trg.monitor, trg.desktop);
 				return;
 			} else {