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

Fix crash when moving view across outputs

Browse source 
It was incorrectly determining that the container being moved and the
destination had the same parent, which resulted in tree corruption. Both
parents can be NULL but the containers may belong to different
workspaces.

To reproduce, create layout H[V[view] view] in one workspace then move a
view left or right from another output into that workspace.
This commit is contained in:
Ryan Dwyer 2018-09-06 11:53:55 +10:00
parent 97474f12e3
commit 01117db6d9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/commands/move.c
View file

@ -117,7 +117,8 @@ static void container_move_to_container_from_direction(
struct sway_container *container, struct sway_container *destination, struct sway_container *container, struct sway_container *destination,
enum movement_direction move_dir) { enum movement_direction move_dir) {
if (destination->view) { if (destination->view) {
if (destination->parent == container->parent) { if (destination->parent == container->parent &&
destination->workspace == container->workspace) {
wlr_log(WLR_DEBUG, "Swapping siblings"); wlr_log(WLR_DEBUG, "Swapping siblings");
list_t *siblings = container_get_siblings(container); list_t *siblings = container_get_siblings(container);
int container_index = list_find(siblings, container); int container_index = list_find(siblings, container);