From 437245b6639cade64c870b77cf3d21ef049ac676 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 7 Sep 2018 10:37:12 -0400
Subject: [PATCH] Address new_output == NULL in seat_set_focus_warp

---
 sway/input/seat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sway/input/seat.c b/sway/input/seat.c
index e86a2b815..e3b7f0c95 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -710,7 +710,8 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
 			workspace_consider_destroy(last_workspace);
 		}
 
-		if (config->mouse_warping && warp && new_output != last_output) {
+		if (config->mouse_warping && warp &&
+				new_output != last_output && new_output) {
 			double x = 0;
 			double y = 0;
 			if (container) {