aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-04-02 12:28:08 -0400
committerGitHub <noreply@github.com>2018-04-02 12:28:08 -0400
commit2a8985a3451f8be7e4b1eb21e3266e9f5b979b39 (patch)
treeab377eb7b78ed91bd430579468afa2190b86762a /sway/tree
parent7e3aa1daa8b945b762d98bc67c660cdc6c94b72f (diff)
parentc901510e01f7648a549187b128ed9d0f9c5627eb (diff)
Merge pull request #1697 from RedSoxFan/back-and-forth
Fix back-and-forth workspace name saving for non-empty workspaces
Diffstat (limited to 'sway/tree')
-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) {
}
struct sway_container *active_ws = focus;
if (active_ws->type != C_WORKSPACE) {
- container_parent(focus, C_WORKSPACE);
+ active_ws = container_parent(focus, C_WORKSPACE);
}
if (config->auto_back_and_forth