Merge pull request #2248 from Dudemanguy911/fix_crash_on_floating_windows

fix crash on floating windows
This commit is contained in:
Drew DeVault 2018-07-11 15:26:47 -07:00 committed by GitHub
commit 2bc18d8cf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -671,7 +671,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
// This must happen for both the pending and current children lists. // This must happen for both the pending and current children lists.
if (container_is_floating(container)) { if (container_is_floating(container)) {
list_move_to_end(container->parent->children, container); list_move_to_end(container->parent->children, container);
list_move_to_end(container->parent->current.children, container); if (container_has_ancestor(container, container->current.parent)) {
list_move_to_end(container->parent->current.children, container);
}
} }
// clean up unfocused empty workspace on new output // clean up unfocused empty workspace on new output