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

Fix crash in swap command

Browse source 
When swapping containers that are in the root of the workspace, parent
will be NULL.
This commit is contained in:
Ryan Dwyer 2018-10-15 19:40:40 +10:00
parent 56c388b510
commit fe803b89a7
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/commands/swap.c
View file

@ -22,6 +22,7 @@ static void swap_places(struct sway_container *con1,
temp->width = con1->width; temp->width = con1->width;
temp->height = con1->height; temp->height = con1->height;
temp->parent = con1->parent; temp->parent = con1->parent;
temp->workspace = con1->workspace;
con1->x = con2->x; con1->x = con2->x;
con1->y = con2->y; con1->y = con2->y;
@ -34,8 +35,18 @@ static void swap_places(struct sway_container *con1,
con2->height = temp->height; con2->height = temp->height;
int temp_index = container_sibling_index(con1); int temp_index = container_sibling_index(con1);
container_insert_child(con2->parent, con1, container_sibling_index(con2)); if (con2->parent) {
container_insert_child(con2->parent, con1,
container_sibling_index(con2));
} else {
workspace_insert_tiling(con2->workspace, con1,
container_sibling_index(con2));
}
if (temp->parent) {
container_insert_child(temp->parent, con2, temp_index); container_insert_child(temp->parent, con2, temp_index);
} else {
workspace_insert_tiling(temp->workspace, con2, temp_index);
}
free(temp); free(temp);
} }