Only call workspace_auto_back_and_forth when needed

Instead of disabling it for some workspace subcommands, this explicitly
calls it only in the 2 places it's actually needed: for switching to a
named or numbered workspace.
This commit is contained in:
Ragnar Groot Koerkamp 2021-06-18 13:13:21 +02:00 committed by Simon Ser
parent 3080f1b9ce
commit d5c71231e5
2 changed files with 12 additions and 11 deletions

View file

@ -572,12 +572,13 @@ struct sway_workspace *workspace_auto_back_and_forth(
active_ws = focus->sway_container->pending.workspace;
}
if (config->auto_back_and_forth && active_ws &&
active_ws == workspace && seat->prev_workspace_name) {
if (config->auto_back_and_forth && active_ws && active_ws == workspace &&
seat->prev_workspace_name) {
struct sway_workspace *new_ws =
workspace_by_name(seat->prev_workspace_name);
workspace = new_ws ? new_ws
: workspace_create(NULL, seat->prev_workspace_name);
workspace_by_name(seat->prev_workspace_name);
workspace = new_ws ?
new_ws :
workspace_create(NULL, seat->prev_workspace_name);
}
return workspace;
}