aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/workspace.c
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-10-21 08:59:59 +0200
committerGitHub <noreply@github.com>2018-10-21 08:59:59 +0200
commita4d6835881a1ce276ae68f33e5dc94776ee28424 (patch)
tree2255d845647357cdbe6fdfcb1c6a40210a69ddb7 /sway/commands/workspace.c
parent3f02218b54645a68a7496eb15b7bb16d26b75ae2 (diff)
parentc5a6c37275978ddc8c221ca73ae1a39254dd68f5 (diff)
Merge pull request #2903 from RyanDwyer/seat-specific-backandforth
Make workspace back_and_forth seat-specific
Diffstat (limited to 'sway/commands/workspace.c')
-rw-r--r--sway/commands/workspace.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index da597f8a..745b40c7 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -142,12 +142,13 @@ 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 (!prev_workspace_name) {
+ struct sway_seat *seat = config->handler_context.seat;
+ if (!seat->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);
+ ws = workspace_create(NULL, seat->prev_workspace_name);
}
} else {
char *name = join_args(argv, argc);