From 63b8f5423ae6a2ea9f6307438825397901860ecf Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Wed, 25 May 2011 22:30:41 +0000
Subject: [PATCH] IDE: Rest of changes from August Klein for 'Single Button in
 Taskbar', issue #19320

git-svn-id: trunk@30908 -
---
 ide/main.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ide/main.pp b/ide/main.pp
index 43558c157a..921d0df89d 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -16934,10 +16934,12 @@ begin
     while LastActivatedWindows.Count>0 do
     begin
       AForm:=TCustomForm(LastActivatedWindows[0]);
-      if Assigned(AForm) and AForm.IsVisible then
+      if Assigned(AForm) and (not (CsDestroying in AForm.ComponentState)) and
+      AForm.IsVisible then
         AForm.BringToFront;
       LastActivatedWindows.Delete(0);
     end;
+    MainIDEBar.BringToFront;
   end;
 end;