From ff8f204cacb242ba9fc9ec3acf1c416819936a50 Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Mon, 17 Apr 2017 19:22:12 +0200
Subject: [PATCH] Check for dead destination airfield in ReturnToBase

---
 OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
index 7ba8274df2..3c5e47cd9b 100644
--- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Activities
 
 		void Calculate(Actor self)
 		{
-			if (dest == null || Reservable.IsReserved(dest))
+			if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
 				dest = ChooseAirfield(self, true);
 
 			if (dest == null)
@@ -116,7 +116,7 @@ namespace OpenRA.Mods.Common.Activities
 			if (!isCalculated)
 				Calculate(self);
 
-			if (dest == null)
+			if (dest == null || dest.IsDead)
 			{
 				var nearestAfld = ChooseAirfield(self, false);