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

Fix crash in move workspace to output command

Browse source 
Fixes #2026.
This commit is contained in:
Ryan Dwyer 2018-05-24 23:01:17 +10:00
parent 66b93c1c18
commit c9630975da
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/tree/layout.c
View file

@ -187,9 +187,17 @@ void container_move_to(struct sway_container *container,
container_notify_child_title_changed(old_parent); container_notify_child_title_changed(old_parent);
container_notify_child_title_changed(new_parent); container_notify_child_title_changed(new_parent);
if (old_parent) { if (old_parent) {
if (old_parent->type == C_OUTPUT) {
arrange_output(old_parent);
} else {
arrange_children_of(old_parent); arrange_children_of(old_parent);
} }
}
if (new_parent->type == C_OUTPUT) {
arrange_output(new_parent);
} else {
arrange_children_of(new_parent); arrange_children_of(new_parent);
}
// If view was moved to a fullscreen workspace, refocus the fullscreen view // If view was moved to a fullscreen workspace, refocus the fullscreen view
struct sway_container *new_workspace = container; struct sway_container *new_workspace = container;
if (new_workspace->type != C_WORKSPACE) { if (new_workspace->type != C_WORKSPACE) {