aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-08-03 09:45:24 +0100
committerGitHub <noreply@github.com>2018-08-03 09:45:24 +0100
commit942f92f3eb8dd035e26378c3bfd65bab30f2533a (patch)
treef2790e18e5f7d96c1ba2943906baf09f670e0576
parent5ac3509d546ee2e585ecb58aeea94ff9f3e8259d (diff)
parent9e8d628a17f4681e27da227a8daec3628678ad26 (diff)
downloadsway-942f92f3eb8dd035e26378c3bfd65bab30f2533a.zip
sway-942f92f3eb8dd035e26378c3bfd65bab30f2533a.tar.gz
sway-942f92f3eb8dd035e26378c3bfd65bab30f2533a.tar.bz2
Merge pull request #2413 from RyanDwyer/dont-move-empty-workspace
Deny "move container" when an empty workspace is focused
-rw-r--r--sway/commands/move.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 702b42d..1e8b76f 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",