Merge pull request #2250 from RyanDwyer/fix-crash

Fix crash when launching swaylock
This commit is contained in:
Brian Ashworth 2018-07-12 01:32:35 -04:00 committed by GitHub
commit abcc2ef9eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -669,7 +669,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
// If we've focused a floating container, bring it to the front. // If we've focused a floating container, bring it to the front.
// We do this by putting it at the end of the floating list. // We do this by putting it at the end of the floating list.
// 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 && container_is_floating(container)) {
list_move_to_end(container->parent->children, container); list_move_to_end(container->parent->children, container);
if (container_has_ancestor(container, container->current.parent)) { if (container_has_ancestor(container, container->current.parent)) {
list_move_to_end(container->parent->current.children, container); list_move_to_end(container->parent->current.children, container);