diff options
| author | emersion <contact@emersion.fr> | 2018-10-21 08:59:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 08:59:59 +0200 |
| commit | a4d6835881a1ce276ae68f33e5dc94776ee28424 (patch) | |
| tree | 2255d845647357cdbe6fdfcb1c6a40210a69ddb7 /sway/commands/move.c | |
| parent | 3f02218b54645a68a7496eb15b7bb16d26b75ae2 (diff) | |
| parent | c5a6c37275978ddc8c221ca73ae1a39254dd68f5 (diff) | |
Merge pull request #2903 from RyanDwyer/seat-specific-backandforth
Make workspace back_and_forth seat-specific
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 941b284a..a5b7f661 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -429,8 +429,8 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { ws = workspace_by_name(argv[2]); } else if (strcasecmp(argv[2], "back_and_forth") == 0) { if (!(ws = workspace_by_name(argv[2]))) { - if (prev_workspace_name) { - ws_name = strdup(prev_workspace_name); + if (seat->prev_workspace_name) { + ws_name = strdup(seat->prev_workspace_name); } else { return cmd_results_new(CMD_FAILURE, "move", "No workspace was previously active."); @@ -455,13 +455,13 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { } if (!no_auto_back_and_forth && config->auto_back_and_forth && - prev_workspace_name) { + seat->prev_workspace_name) { // auto back and forth move if (old_ws && old_ws->name && strcmp(old_ws->name, ws_name) == 0) { // if target workspace is the current one free(ws_name); - ws_name = strdup(prev_workspace_name); + ws_name = strdup(seat->prev_workspace_name); ws = workspace_by_name(ws_name); } } |