sway

commit 18a2646c1dc7ddbea61ed5e042c063c35ce43145
parent 113751ea48b9ffa537c357373913ca9caecb68e0
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 16 Oct 2018 18:18:01 +0200

Merge pull request #2852 from RyanDwyer/back-and-forth-crash

Fix crash when using workspace back_and_forth with no previous
Diffstat:
M
sway/commands/workspace.c
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git 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 {