From fbce22784ba476c94afe47736ee5c0b462cfc289 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 18 May 2019 10:15:23 +0000
Subject: [PATCH] Fix ICaptureProgressWatchers continuing after captor
 disposal.

---
 OpenRA.Mods.Common/Traits/CaptureManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

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)