From 51ffa6d5eaa50aee99a4953933da4052c4d9d45c Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Mon, 17 Oct 2016 21:23:58 +0100
Subject: [PATCH] Kill an overlay if the target is removed between P_AddOverlay
 and P_RunOverlays.

---
 src/p_mobj.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index e929b8426..1541ea79c 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6499,6 +6499,13 @@ void P_RunOverlays(void)
 
 		if (!mo->target)
 			continue;
+
+		if (P_MobjWasRemoved(mo->target))
+		{
+			P_RemoveMobj(mo);
+			continue;
+		}
+
 		if (!splitscreen /*&& rendermode != render_soft*/)
 		{
 			angle_t viewingangle;