summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-04-02 12:28:08 -0400
committerLibravatar GitHub <noreply@github.com>2018-04-02 12:28:08 -0400
commit2a8985a3451f8be7e4b1eb21e3266e9f5b979b39 (patch)
treeab377eb7b78ed91bd430579468afa2190b86762a
parentMerge pull request #1693 from swaywm/move-cmd (diff)
parentFixes back-and-forth name saving for non-empty ws (diff)
downloadsway-2a8985a3451f8be7e4b1eb21e3266e9f5b979b39.tar.gz
sway-2a8985a3451f8be7e4b1eb21e3266e9f5b979b39.tar.zst
sway-2a8985a3451f8be7e4b1eb21e3266e9f5b979b39.zip
Merge pull request #1697 from RedSoxFan/back-and-forth
Fix back-and-forth workspace name saving for non-empty workspaces
-rw-r--r--sway/tree/workspace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index c629f1f1..de1bf159 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -351,7 +351,7 @@ bool workspace_switch(struct sway_container *workspace) {
351 } 351 }
352 struct sway_container *active_ws = focus; 352 struct sway_container *active_ws = focus;
353 if (active_ws->type != C_WORKSPACE) { 353 if (active_ws->type != C_WORKSPACE) {
354 container_parent(focus, C_WORKSPACE); 354 active_ws = container_parent(focus, C_WORKSPACE);
355 } 355 }
356 356
357 if (config->auto_back_and_forth 357 if (config->auto_back_and_forth