sway

commit abcc2ef9eb90af3aea7d2eed9cd9800d0ce1e14c
parent 106a9eaf11da74ae4cfc6a268b62efa842251bfa
Author: Brian Ashworth <RedSoxFan@users.noreply.github.com>
Date:   Thu, 12 Jul 2018 01:32:35 -0400

Merge pull request #2250 from RyanDwyer/fix-crash

Fix crash when launching swaylock
Diffstat:
M
sway/input/seat.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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);