From 241124c159f3d2dd52e67109895aa915fab87a30 Mon Sep 17 00:00:00 2001 From: juha Date: Wed, 3 Jan 2018 09:56:41 +0000 Subject: [PATCH] Designer: Simplify DoDeletePersistent. git-svn-id: trunk@56930 - --- designer/designer.pp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/designer/designer.pp b/designer/designer.pp index 311f9c992c..df8e279a31 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -2977,22 +2977,18 @@ end; procedure TDesigner.DoDeletePersistent(APersistent: TPersistent; FreeIt: boolean); var Hook: TPropertyEditorHook; - AComponent: TComponent; - AForm: TCustomForm; begin if APersistent=nil then exit; try //debugln(['TDesigner.DoDeletePersistent A ',dbgsName(APersistent),' FreeIt=',FreeIt]); // unselect component Selection.Remove(APersistent); - if (APersistent is TComponent) then begin + if APersistent is TComponent then begin PopupMenuComponentEditor:=nil; - AComponent:=TComponent(APersistent); - if csDestroying in AComponent.ComponentState then + if csDestroying in TComponent(APersistent).ComponentState then FreeIt:=false; end; - AForm:=GetDesignerForm(APersistent); - if AForm=nil then begin + if GetDesignerForm(APersistent)=nil then begin // has no designer // -> do not call handlers and simply get rid of the rubbish if FreeIt then begin