From 6f609c832f5725bc7edc353b3c05d644499ec879 Mon Sep 17 00:00:00 2001
From: "Olli.Pettay%helsinki.fi" <Olli.Pettay%helsinki.fi>
Date: Sun, 30 Jul 2006 00:26:19 +0000
Subject: [PATCH] backout Bug 346054 to fix regression

---
 layout/xul/base/src/nsPopupSetFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/xul/base/src/nsPopupSetFrame.cpp b/layout/xul/base/src/nsPopupSetFrame.cpp
index 153b5a1b5589..abbab3f9f5c6 100644
--- a/layout/xul/base/src/nsPopupSetFrame.cpp
+++ b/layout/xul/base/src/nsPopupSetFrame.cpp
@@ -368,7 +368,7 @@ nsPopupSetFrame::ShowPopup(nsIContent* aElementContent, nsIContent* aPopupConten
   if ( childPopup && aPopupType.EqualsLiteral("context") )
     childPopup->SetIsContextMenu(PR_TRUE);
 
-  if (!weakFrame.IsAlive() || (entry->mPopupFrame && !weakPopupFrame.IsAlive())) {
+  if (!weakFrame.IsAlive()) {
     return NS_OK;
   }