From bc7f4d73abd743961d8c7ff2084f2682de6538f3 Mon Sep 17 00:00:00 2001
From: michael <michael@lazarus-ide.org>
Date: Wed, 15 Aug 2018 17:49:26 +0000
Subject: [PATCH] * Correct handling of non-modal window

git-svn-id: trunk@58720 -
---
 components/fpreport/design/frmfpreportdesignermain.lfm | 1 +
 components/fpreport/design/frmfpreportdesignermain.pp  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/components/fpreport/design/frmfpreportdesignermain.lfm b/components/fpreport/design/frmfpreportdesignermain.lfm
index 61f5c6976d..002007e2b7 100644
--- a/components/fpreport/design/frmfpreportdesignermain.lfm
+++ b/components/fpreport/design/frmfpreportdesignermain.lfm
@@ -13,6 +13,7 @@ object FPReportDesignerForm: TFPReportDesignerForm
   ClientWidth = 890
   KeyPreview = True
   Menu = MMReport
+  OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
diff --git a/components/fpreport/design/frmfpreportdesignermain.pp b/components/fpreport/design/frmfpreportdesignermain.pp
index 2c880ccb61..47330a0114 100644
--- a/components/fpreport/design/frmfpreportdesignermain.pp
+++ b/components/fpreport/design/frmfpreportdesignermain.pp
@@ -299,6 +299,7 @@ type
     procedure AResizeExecute(Sender: TObject);
     procedure ASendToBackExecute(Sender: TObject);
     procedure ASendToBackFrontUpdate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormDestroy(Sender: TObject);
     procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
@@ -1952,6 +1953,13 @@ begin
                                and (CurrentDesigner.Objects.GetSelection[0].IsPlainElement);
 end;
 
+procedure TFPReportDesignerForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  if Not (fsModal in FFormState) then
+    CloseAction:=caFree;
+
+end;
+
 
 procedure TFPReportDesignerForm.PCReportChange(Sender: TObject);
 begin