From 04f1ebe9690e3a5601baa8c13287a93b66a97a4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 3 Jul 2014 09:19:51 +0200
Subject: [PATCH] abort change owner when the actor is destroyed

fixes #5638
---
 OpenRA.Game/Actor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index d15c0cdbf6..066b5277a0 100644
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -217,6 +217,9 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
+				if (this.Destroyed)
+					return;
+
 				var oldOwner = Owner;
 
 				// momentarily remove from world so the ownership queries don't get confused