Merge pull request #2413 from RyanDwyer/dont-move-empty-workspace

Deny "move container" when an empty workspace is focused

1 files changed, 4 insertions, 0 deletions

diff --git a/sway/commands/move.c b/sway/commands/move.c
index 702b42d9..1e8b76f9 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -59,6 +59,10 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
                         && strcasecmp(argv[2], "workspace") == 0) {
                 // move container to workspace x
                 if (current->type == C_WORKSPACE) {
+                        if (current->children->length == 0) {
+                                return cmd_results_new(CMD_FAILURE, "move",
+                                                "Can't move an empty workspace");
+                        }
                         current = container_wrap_children(current);
                 } else if (current->type != C_CONTAINER && current->type != C_VIEW) {
                         return cmd_results_new(CMD_FAILURE, "move",