From 5947c4f6edbffb2dca0f00ddcd7474b90b1dd289 Mon Sep 17 00:00:00 2001
From: "pinkerton%netscape.com" <pinkerton%netscape.com>
Date: Tue, 6 Feb 2001 05:33:28 +0000
Subject: [PATCH] fix for 51053, where we'd throw too early when trying to
 close popups. added try/catch around each individual QI. r=ben/sr=scc.

---
 xpfe/global/resources/content/xulBindings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xpfe/global/resources/content/xulBindings.xml b/xpfe/global/resources/content/xulBindings.xml
index d3f567853491..08cc8924ea98 100644
--- a/xpfe/global/resources/content/xulBindings.xml
+++ b/xpfe/global/resources/content/xulBindings.xml
@@ -473,6 +473,8 @@
         <![CDATA[
           try {
             var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
+          } catch(e) {}
+          try {
             var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
           } catch(e) {}
           if (popupSetBox)
@@ -487,6 +489,8 @@
         <![CDATA[
           try {
             var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
+          } catch(e) {}
+          try {
             var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
           } catch(e) {}
           if (popupSetBox)
@@ -501,6 +505,8 @@
           <![CDATA[
             try {
               var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
+            } catch(e) {}
+            try {
               var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
             } catch(e) {}
             if (popupSetBox)
@@ -514,6 +520,8 @@
           <![CDATA[
             try {
               var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
+            } catch(e) {}
+            try {
               var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
             } catch(e) {}
             if (popupSetBox)