Merge pull request #8791 from penev92/bleed_cancelActivity

Fix an NRE when cancelling repair orders on units at the wrong time
This commit is contained in:
Oliver Brakmann
2015-07-26 11:09:56 +02:00

View File

@@ -45,7 +45,8 @@ namespace OpenRA.Mods.Common.Activities
if (transportable != null)
transportable.WantsTransport = false;
inner.Cancel(self);
if (inner != null)
inner.Cancel(self);
}
}
}