Merge pull request #9852 from RoosterDragon/event-handler-removals

Detach some event handlers
2015-11-05 22:46:42 +01:00
parent ee1ef5eff7 6f09d1a2f4
commit e609abf445
6 changed files with 53 additions and 28 deletions
--- a/OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs
+++ b/OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs
@@ -207,6 +207,8 @@ namespace OpenRA.Mods.Common.Traits
 			foreach (var kv in spriteLayers.Values)
 				kv.Dispose();

+			Map.MapResources.Value.CellEntryChanged -= UpdateCell;
+
 			disposed = true;
 		}
 	}
--- a/OpenRA.Mods.Common/Traits/World/ResourceLayer.cs
+++ b/OpenRA.Mods.Common/Traits/World/ResourceLayer.cs
@@ -294,6 +294,8 @@ namespace OpenRA.Mods.Common.Traits
 			foreach (var kv in spriteLayers.Values)
 				kv.Dispose();

+			RenderContent.CellEntryChanged -= UpdateSpriteLayers;
+
 			disposed = true;
 		}