diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-03-19 17:57:44 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-04-03 11:00:29 -0400 |
| commit | a99a1f0cc9934c019b0d31ce030a32f77725865a (patch) | |
| tree | a6873b68ec2123a293fc1c89658cea4e2ebdbfc3 | |
| parent | b64d608ddc343cf37d0b748e173fa4b5587c4817 (diff) | |
| download | sway-a99a1f0cc9934c019b0d31ce030a32f77725865a.zip sway-a99a1f0cc9934c019b0d31ce030a32f77725865a.tar.gz sway-a99a1f0cc9934c019b0d31ce030a32f77725865a.tar.bz2 | |
Merge pull request #1130 from oranenj/fix_move_next_crash
Fix move next crash
| -rw-r--r-- | sway/container.c | 2 | ||||
| -rw-r--r-- | sway/layout.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/container.c b/sway/container.c index 2f656bd..427f71a 100644 --- a/sway/container.c +++ b/sway/container.c @@ -218,7 +218,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) { swayc_t *workspace = new_swayc(C_WORKSPACE); workspace->prev_layout = L_NONE; - workspace->layout = L_HORIZ; + workspace->layout = default_layout(output); workspace->workspace_layout = default_layout(output); workspace->x = output->x; diff --git a/sway/layout.c b/sway/layout.c index 5e144cd..6a493df 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -395,7 +395,7 @@ void move_container(swayc_t *container, enum movement_direction dir) { sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", container,parent,child); if (parent->layout == layout - || (layout == L_NONE && parent->type == C_CONTAINER) /* accept any layout for next/prev direction */ + || (layout == L_NONE && (parent->type == C_CONTAINER || parent->type == C_WORKSPACE)) /* accept any layout for next/prev direction */ || (parent->layout == L_TABBED && layout == L_HORIZ) || (parent->layout == L_STACKED && layout == L_VERT) || is_auto_layout(parent->layout)) { |