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 | Merge pull request #2836 from RyanDwyer/set-set-raw-focus (diff) | |
parent | Fix crash when using workspace back_and_forth with no previous (diff) | |
download | sway-18a2646c1dc7ddbea61ed5e042c063c35ce43145.tar.gz sway-18a2646c1dc7ddbea61ed5e042c063c35ce43145.tar.zst sway-18a2646c1dc7ddbea61ed5e042c063c35ce43145.zip |
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) { | |||
142 | strcasecmp(argv[0], "current") == 0) { | 142 | strcasecmp(argv[0], "current") == 0) { |
143 | ws = workspace_by_name(argv[0]); | 143 | ws = workspace_by_name(argv[0]); |
144 | } else if (strcasecmp(argv[0], "back_and_forth") == 0) { | 144 | } else if (strcasecmp(argv[0], "back_and_forth") == 0) { |
145 | if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) { | 145 | if (!prev_workspace_name) { |
146 | return cmd_results_new(CMD_INVALID, "workspace", | ||
147 | "There is no previous workspace"); | ||
148 | } | ||
149 | if (!(ws = workspace_by_name(argv[0]))) { | ||
146 | ws = workspace_create(NULL, prev_workspace_name); | 150 | ws = workspace_create(NULL, prev_workspace_name); |
147 | } | 151 | } |
148 | } else { | 152 | } else { |