From e7d62bd2fa52f461bcae82584614125c36e28839 Mon Sep 17 00:00:00 2001
From: Loesje_ <Loesje_@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 4 Nov 2010 14:22:29 +0000
Subject: [PATCH]  * Do not try to shutdown Gecko if it failed to load, to
 avoid exceptions during exceptions

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

diff --git a/components/geckoport/Components/GeckoBrowser.pas b/components/geckoport/Components/GeckoBrowser.pas
index 9a5e0bbde..41b08cd35 100755
--- a/components/geckoport/Components/GeckoBrowser.pas
+++ b/components/geckoport/Components/GeckoBrowser.pas
@@ -179,6 +179,8 @@ type
 
     FOnSetupProperties: TNotifyEvent;
 
+    FGeckoComponentsStartupSucceeded: boolean;
+
     //misc settings
     FDisableJavaScript: Boolean;
     FInitialized: Boolean;
@@ -1012,6 +1014,7 @@ begin
   if not (csDesigning in ComponentState) then
   begin
     GeckoComponentsStartup;
+    FGeckoComponentsStartupSucceeded := true;
   end;
 end;
 
@@ -1027,7 +1030,8 @@ begin
     Chrome := nil;
     Listener := nil;
 
-    GeckoComponentsShutdown;
+    if FGeckoComponentsStartupSucceeded then
+      GeckoComponentsShutdown;
   end;
 
   inherited;