diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-07-12 01:32:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-12 01:32:35 -0400 |
commit | abcc2ef9eb90af3aea7d2eed9cd9800d0ce1e14c (patch) | |
tree | 0dfcd35ff8fdb8f7cbeeeb690fdd346b8dbb1df7 /sway/input | |
parent | 106a9eaf11da74ae4cfc6a268b62efa842251bfa (diff) | |
parent | ee0e1b170ec1fce2c92a495293ff8aced83b0cb1 (diff) |
Merge pull request #2250 from RyanDwyer/fix-crash
Fix crash when launching swaylock
Diffstat (limited to 'sway/input')
-rw-r--r-- | sway/input/seat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index be37258f..5e65ca70 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -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. // We do this by putting it at the end of the floating list. // 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); if (container_has_ancestor(container, container->current.parent)) { list_move_to_end(container->parent->current.children, container); |