mirror/sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-11-18 04:33:59 +01:00
Code Issues

Fix another crash when moving out of stacks or tabs

Browse Source
This commit is contained in:
Ryan Dwyer 2018-06-24 23:07:52 +10:00
parent 1549fb719a
commit a3976e2659
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sway/tree/container.c
View File

@ -331,6 +331,10 @@ struct sway_container *container_destroy_noreaping(struct sway_container *con) {
con->destroying = true; con->destroying = true;
list_add(server.destroying_containers, con); list_add(server.destroying_containers, con);
if (!con->parent) {
return NULL;
}
return container_remove_child(con); return container_remove_child(con);
} }
@ -384,7 +388,7 @@ struct sway_container *container_flatten(struct sway_container *container) {
struct sway_container *child = container->children->items[0]; struct sway_container *child = container->children->items[0];
struct sway_container *parent = container->parent; struct sway_container *parent = container->parent;
container_replace_child(container, child); container_replace_child(container, child);
container_destroy(container); container_destroy_noreaping(container);
container = parent; container = parent;
} }
return container; return container;