From 62257459fdb8e0f20109d7eef84a717362e3a93c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 14 Sep 2012 23:20:39 +1200 Subject: [PATCH] fix NRE in ReturnToBase bailout if no suitable building is found --- OpenRA.Mods.RA/Air/ReturnToBase.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Air/ReturnToBase.cs b/OpenRA.Mods.RA/Air/ReturnToBase.cs index 3891383786..e21762e576 100755 --- 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(