From 4de7d6ce708eb3d5b968cbf04fa53320976535ab Mon Sep 17 00:00:00 2001
From: Luke Ordelmans <luke.ordelmans@malvernpanalytical.com>
Date: Wed, 29 Nov 2023 07:53:40 +0100
Subject: [PATCH 1/2] remove OnPropertyChanged from
 RenderTransformOriginExtension.ExtendedItem in OnRemove()

---
 .../Project/Extensions/RenderTransformOriginExtension.cs        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs b/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs
index 2767484..f91a5c7 100644
--- a/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs
+++ b/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs
@@ -18,6 +18,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Threading;
 using ICSharpCode.WpfDesign.Adorners;
 using ICSharpCode.WpfDesign.Extensions;
 using System.Windows.Controls.Primitives;
@@ -116,6 +117,7 @@ void OnPropertyChanged(object sender, System.ComponentModel.PropertyChangedEvent
 		
 		protected override void OnRemove()
 		{
+			this.ExtendedItem.PropertyChanged -= OnPropertyChanged;
 			renderTransformOriginPropertyDescriptor.RemoveValueChanged(this.ExtendedItem.Component, OnRenderTransformOriginPropertyChanged);
 			
 			base.OnRemove();

From 8ab8159ff47f2cdf1ee65d901a09e858acf865b6 Mon Sep 17 00:00:00 2001
From: Luke Ordelmans <luke.ordelmans@malvernpanalytical.com>
Date: Wed, 29 Nov 2023 07:55:19 +0100
Subject: [PATCH 2/2] removed unused field from RenderTransformOriginExtension

---
 .../Project/Extensions/RenderTransformOriginExtension.cs      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs b/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs
index f91a5c7..03d9e67 100644
--- a/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs
+++ b/WpfDesign.Designer/Project/Extensions/RenderTransformOriginExtension.cs
@@ -34,8 +34,7 @@ public class RenderTransformOriginExtension : SelectionAdornerProvider
 	{
 		readonly AdornerPanel adornerPanel;
 		RenderTransformOriginThumb renderTransformOriginThumb;
-		/// <summary>An array containing this.ExtendedItem as only element</summary>
-		readonly DesignItem[] extendedItemArray = new DesignItem[1];
+
 //		IPlacementBehavior resizeBehavior;
 //		PlacementOperation operation;
 //		ChangeGroup changeGroup;
@@ -87,7 +86,6 @@ void renderTransformOriginThumb_DragDelta(object sender, DragDeltaEventArgs e)
 		protected override void OnInitialized()
 		{
 			base.OnInitialized();
-			extendedItemArray[0] = this.ExtendedItem;
 			this.ExtendedItem.PropertyChanged += OnPropertyChanged;
 			
 			if (this.ExtendedItem.Properties.GetProperty(FrameworkElement.RenderTransformOriginProperty).IsSet) {