fix NRE in ReturnToBase bailout if no suitable building is found

2012-09-14 23:20:39 +12:00
parent ea641f081f
commit 62257459fd
1 changed files with 4 additions and 1 deletions
--- a/OpenRA.Mods.RA/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs
@@ -97,7 +97,10 @@ namespace OpenRA.Mods.RA.Air
 				var nearestAfld = ChooseAirfield(self, false);
 				
 				self.CancelActivity();
-				return Util.SequenceActivities(Fly.ToCell(nearestAfld.Location), new FlyCircle());
+				if (nearestAfld != null)
+					return Util.SequenceActivities(Fly.ToCell(nearestAfld.Location), new FlyCircle());
+				else
+					return new FlyCircle();
 			}

 			return Util.SequenceActivities(