diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-16 18:18:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 18:18:01 +0200 |
| commit | 18a2646c1dc7ddbea61ed5e042c063c35ce43145 (patch) | |
| tree | 573f5ef06aef8ef8a0fb2428ac26365a1f30a1c4 | |
| parent | 113751ea48b9ffa537c357373913ca9caecb68e0 (diff) | |
| parent | d0974d5c5009f41519923ffdbde7e1a0a3155475 (diff) | |
Merge pull request #2852 from RyanDwyer/back-and-forth-crash
Fix crash when using workspace back_and_forth with no previous
| -rw-r--r-- | sway/commands/workspace.c | 6 |
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 { |