alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix 'workspace back_and_forth' and workspace_auto_back_and_forth clash

Browse source 
When workspace_auto_back_and_forth is enabled, workspaces get switched
twice with previously mentioned command, which is not the expected
behavior.

Removes one redundant creation of previous workspace.
This commit is contained in:
D.B 2016-08-04 21:16:54 +02:00
parent 4b0de51766
commit 132017d242
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/commands.c
View file

@ -2563,11 +2563,14 @@ static struct cmd_results *cmd_workspace(int argc, char **argv) {
} else if (strcasecmp(argv[0], "prev_on_output") == 0) { } else if (strcasecmp(argv[0], "prev_on_output") == 0) {
ws = workspace_output_prev(); ws = workspace_output_prev();
} else if (strcasecmp(argv[0], "back_and_forth") == 0) { } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
if (prev_workspace_name) { // if auto_back_and_forth is enabled, workspace_switch will swap
if (!(ws = workspace_by_name(prev_workspace_name))) { // the workspaces. If we created prev_workspace here, workspace_switch
// would put us back on original workspace.
if (config->auto_back_and_forth) {
ws = swayc_active_workspace();
} else if (prev_workspace_name && !(ws = workspace_by_name(prev_workspace_name))) {
ws = workspace_create(prev_workspace_name); ws = workspace_create(prev_workspace_name);
} }
}
} else { } else {
if (!(ws = workspace_by_name(argv[0]))) { if (!(ws = workspace_by_name(argv[0]))) {
ws = workspace_create(argv[0]); ws = workspace_create(argv[0]);