From 017020f2c3c25b596986ece8fce4a0382e6c0fce Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Mon, 8 Aug 2016 22:03:26 +0100
Subject: [PATCH] Fix stack overflow in FindResources.

---
 OpenRA.Mods.Common/Activities/FindResources.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Activities/FindResources.cs b/OpenRA.Mods.Common/Activities/FindResources.cs
index 11ad62c607..4ba9773c75 100644
--- a/OpenRA.Mods.Common/Activities/FindResources.cs
+++ b/OpenRA.Mods.Common/Activities/FindResources.cs
@@ -79,7 +79,11 @@ namespace OpenRA.Mods.Common.Activities
 					n.MovingToResources(self, moveTo, this);
 
 				var randFrames = self.World.SharedRandom.Next(100, 175);
-				return ActivityUtils.SequenceActivities(NextActivity, new Wait(randFrames), this);
+
+				// Avoid creating an activity cycle
+				var next = NextActivity;
+				NextActivity = null;
+				return ActivityUtils.SequenceActivities(next, new Wait(randFrames), this);
 			}
 			else
 			{