diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2018-04-02 13:23:43 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 13:23:43 -0400 |
| commit | 5e024278a62e6fb00a0521240244c428d2382984 (patch) | |
| tree | d9010d33d4d576297cc5e40d41bed4bb7bf5631a /sway/tree/workspace.c | |
| parent | dont copy input config (diff) | |
| parent | Merge pull request #1697 from RedSoxFan/back-and-forth (diff) | |
| download | sway-5e024278a62e6fb00a0521240244c428d2382984.tar.gz sway-5e024278a62e6fb00a0521240244c428d2382984.tar.zst sway-5e024278a62e6fb00a0521240244c428d2382984.zip | |
Merge branch 'wlroots' into seat-fixes
Diffstat (limited to 'sway/tree/workspace.c')
| -rw-r--r-- | sway/tree/workspace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index c47bab33..74330884 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 |