epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent premature nulling of childactivities.

Browse Source
This commit is contained in:
tovl
2019-02-27 21:40:31 +01:00
committed by Paul Chote
parent 35dba74ded
commit 69004f2b94
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Activities/Activity.cs
View File

@@ -99,7 +99,7 @@ namespace OpenRA.Activities
{ {
get get
{ {
return childActivity != null && childActivity.State < ActivityState.Done ? childActivity : null; return childActivity != null && childActivity.State != ActivityState.Done ? childActivity : null;
} }
set set
@@ -229,7 +229,6 @@ namespace OpenRA.Activities
if (!keepQueue) if (!keepQueue)
NextActivity = null; NextActivity = null;
ChildActivity = null;
State = ActivityState.Canceled; State = ActivityState.Canceled;
return true; return true;