From 72f0fe8876f14aa459d50896cffa866be910de65 Mon Sep 17 00:00:00 2001
From: maxim <maxim@lazarus-ide.org>
Date: Wed, 3 Jan 2018 14:05:31 +0000
Subject: [PATCH] Merged revision(s) 56904 #f8d6369f36 from trunk: Designer: Do
 not free component's PopupMenuComponentEditor when deleting a CollectionItem.
 Issue #32820. ........

git-svn-id: branches/fixes_1_8@56937 -
---
 designer/designer.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer/designer.pp b/designer/designer.pp
index 1e275f0df1..91b38d6460 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -2985,10 +2985,10 @@ begin
   if APersistent=nil then exit;
   try
     //debugln(['TDesigner.DoDeletePersistent A ',dbgsName(APersistent),' FreeIt=',FreeIt]);
-    PopupMenuComponentEditor:=nil;
     // unselect component
     Selection.Remove(APersistent);
     if (APersistent is TComponent) then begin
+      PopupMenuComponentEditor:=nil;
       AComponent:=TComponent(APersistent);
       if csDestroying in AComponent.ComponentState then
         FreeIt:=false;