From 31d7684f17a2260fe78a877daca5330bf3074224 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 10 Oct 2016 20:51:55 -0400 Subject: Merge pull request #947 from alkino/fix_move_empty_workspace Can't move an empty workspace --- sway/commands/move.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sway/commands/move.c b/sway/commands/move.c index 5b97897..48e9d56 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -34,6 +34,9 @@ struct cmd_results *cmd_move(int argc, char **argv) { } else if (strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "workspace") == 0) { // move container to workspace x if (view->type == C_WORKSPACE) { + if (!view->children || view->children->length == 0) { + return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); + } view = new_container(view, view->layout); } if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); @@ -59,6 +62,9 @@ struct cmd_results *cmd_move(int argc, char **argv) { struct wlc_point abs_pos; get_absolute_center_position(view, &abs_pos); if (view->type == C_WORKSPACE) { + if (!view->children || view->children->length == 0) { + return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); + } view = new_container(view, view->layout); } else if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); -- cgit v1.1