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

Merge pull request #11234 from obrakmann/fix11218-spawnactorondeath-dispose-race

Browse Source 
Fix trait lookup of destroyed actor in SpawnActorOnDeath
This commit is contained in:
Paul Chote
2016-05-07 15:58:20 +01:00
parent 5462097c42 35dfb54459
commit bd7e53bec4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -77,6 +77,10 @@ namespace OpenRA.Mods.Common.Traits
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
// Actor has been disposed by something else before its death (for example `Enter`).
if (self.Disposed)
return;
var td = new TypeDictionary var td = new TypeDictionary
{ {
new ParentActorInit(self), new ParentActorInit(self),