Fix crash when using workspace back_and_forth with no previous

1 files changed, 5 insertions, 1 deletions

diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 61aa443d..58c2201d 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -142,7 +142,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 strcasecmp(argv[0], "current") == 0) {
                         ws = workspace_by_name(argv[0]);
                 } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
-                        if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) {
+                        if (!prev_workspace_name) {
+                                return cmd_results_new(CMD_INVALID, "workspace",
+                                                "There is no previous workspace");
+                        }
+                        if (!(ws = workspace_by_name(argv[0]))) {
                                 ws = workspace_create(NULL, prev_workspace_name);
                         }
                 } else {