From eaf9341498d35d2fdf1d3e1aafeefd2ee13f041a Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 17 Sep 2014 12:40:46 +0000
Subject: [PATCH] RxMDI: fix AV on close not active child window

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3574 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxmdi.pas | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/rx/trunk/rxmdi.pas b/components/rx/trunk/rxmdi.pas
index 8cf3c6d16..a9f861e8e 100644
--- a/components/rx/trunk/rxmdi.pas
+++ b/components/rx/trunk/rxmdi.pas
@@ -710,7 +710,11 @@ end;
 
 procedure TRxMDIButton.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  FNavPanel.ChildWindowsShowLast;
+  if (not Assigned(FNavPanel)) or (not Assigned(FNavPanel.FMainPanel)) then
+    exit;
+
+  if FNavPanel.FMainPanel.FCurrentChildWindow = Sender then
+    FNavPanel.ChildWindowsShowLast;
   FNavPanel.ShowHiddenBtnOnResize;
   CloseAction:=caFree;
   Owner.RemoveComponent(Self);