diff --git a/OpenRA.Mods.Common/Traits/CaptureManager.cs b/OpenRA.Mods.Common/Traits/CaptureManager.cs index b315bcfbc5..138aa6ebff 100644 --- a/OpenRA.Mods.Common/Traits/CaptureManager.cs +++ b/OpenRA.Mods.Common/Traits/CaptureManager.cs @@ -189,6 +189,10 @@ namespace OpenRA.Mods.Common.Traits { captures = null; + // Prevent a capture being restarted after it has been canceled during disposal + if (self.WillDispose) + return false; + if (target != currentTarget) { if (currentTarget != null)