alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1130 from oranenj/fix_move_next_crash

Browse source 
Fix move next crash
This commit is contained in:
Drew DeVault 2017-03-19 17:57:44 -04:00 committed by GitHub
parent 0fa8b5abfb 924ed6464c
commit e659db4f73
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/container.c
View file

@ -218,7 +218,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
swayc_t *workspace = new_swayc(C_WORKSPACE); swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->prev_layout = L_NONE; workspace->prev_layout = L_NONE;
workspace->layout = L_HORIZ; workspace->layout = default_layout(output);
workspace->workspace_layout = default_layout(output); workspace->workspace_layout = default_layout(output);
workspace->x = output->x; workspace->x = output->x;

2
sway/layout.c
View file

@ -417,7 +417,7 @@ void move_container(swayc_t *container, enum movement_direction dir, int move_am
sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", sway_log(L_DEBUG, "container:%p, parent:%p, child %p,",
container,parent,child); container,parent,child);
if (parent->layout == layout 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_TABBED && layout == L_HORIZ)
|| (parent->layout == L_STACKED && layout == L_VERT) || (parent->layout == L_STACKED && layout == L_VERT)
|| is_auto_layout(parent->layout)) { || is_auto_layout(parent->layout)) {