aboutsummaryrefslogtreecommitdiff
path: root/sway/tree/workspace.c
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2018-04-02 14:06:04 -0400
committerTony Crisci <tony@dubstepdish.com>2018-04-02 14:06:04 -0400
commit2187684bd09928748f8b3a82c2e25e5ae82f5ae6 (patch)
treee70e2862280a410f8f0d617abc3539d6f0ae056e /sway/tree/workspace.c
parentb5d49cc4e86b5da5a3479c2d2a763be50184f75d (diff)
parent2a8985a3451f8be7e4b1eb21e3266e9f5b979b39 (diff)
Merge branch 'wlroots' into split-containers
Diffstat (limited to 'sway/tree/workspace.c')
-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