From 69004f2b94cb7f40791d326c4a88da03ca123aca Mon Sep 17 00:00:00 2001 From: tovl Date: Wed, 27 Feb 2019 21:40:31 +0100 Subject: [PATCH] Prevent premature nulling of childactivities. --- OpenRA.Game/Activities/Activity.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenRA.Game/Activities/Activity.cs b/OpenRA.Game/Activities/Activity.cs index 648cce8045..601efb318c 100644 --- a/OpenRA.Game/Activities/Activity.cs +++ b/OpenRA.Game/Activities/Activity.cs @@ -99,7 +99,7 @@ namespace OpenRA.Activities { get { - return childActivity != null && childActivity.State < ActivityState.Done ? childActivity : null; + return childActivity != null && childActivity.State != ActivityState.Done ? childActivity : null; } set @@ -229,7 +229,6 @@ namespace OpenRA.Activities if (!keepQueue) NextActivity = null; - ChildActivity = null; State = ActivityState.Canceled; return true;