aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/workspace.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/workspace.c')
-rw-r--r--sway/commands/workspace.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 362dcd1b..b911b2f6 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -185,8 +185,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
struct sway_seat *seat = config->handler_context.seat;
struct sway_workspace *current = seat_get_focused_workspace(seat);
if (!current) {
- return cmd_results_new(CMD_FAILURE, "workspace",
- "No workspace to switch from");
+ return cmd_results_new(CMD_FAILURE, "No workspace to switch from");
}
struct sway_workspace *ws = NULL;
@@ -227,6 +226,9 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
}
free(name);
}
+ if (!ws) {
+ return cmd_results_new(CMD_FAILURE, "No workspace to switch to");
+ }
workspace_switch(ws, no_auto_back_and_forth);
seat_consider_warp_to_focus(seat);
}