From d6a26f2c28a494b068bd21664b84430c6375636b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Thu, 13 Jan 2022 22:41:01 +0100
Subject: [PATCH] * Remove component from previous owner. Fix issue #39529

---
 rtl/objpas/classes/compon.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rtl/objpas/classes/compon.inc b/rtl/objpas/classes/compon.inc
index 7a9918df5e..c6e83dbf88 100644
--- a/rtl/objpas/classes/compon.inc
+++ b/rtl/objpas/classes/compon.inc
@@ -603,6 +603,8 @@ Procedure TComponent.InsertComponent(AComponent: TComponent);
 begin
   AComponent.ValidateContainer(Self);
   ValidateRename(AComponent,'',AComponent.FName);
+  If AComponent.FOwner<>Nil then
+    AComponent.FOwner.Remove(AComponent);
   Insert(AComponent);
   AComponent.SetReference(True);
   If csDesigning in FComponentState then