Fixed ingame crash caused by using "F" on planes when owning no AFLDs

2011-09-28 22:50:44 -06:00
parent 4f5bfceb3f
commit 174ec12ff0
1 changed files with 3 additions and 2 deletions
--- a/OpenRA.Mods.RA/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs
@@ -37,9 +37,9 @@ namespace OpenRA.Mods.RA.Air
 		void Calculate(Actor self)
 		{
 			if (dest == null)
-			{
 				dest = ChooseAirfield(self);
-			}
+
+			if (dest == null) return;

 			var plane = self.Trait<Plane>();
 			var res = dest.TraitOrDefault<Reservable>();
@@ -95,6 +95,7 @@ namespace OpenRA.Mods.RA.Air
 			if (IsCanceled) return NextActivity;
 			if (!isCalculated)
 				Calculate(self);
+			if (dest == null) return NextActivity;

 			return Util.SequenceActivities(
 				Fly.ToPx(w1),