From 9fe40c5630d0a29cd902f95a0e2c1c1b9e0a2cbb Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Tue, 2 Aug 2005 12:00:22 +0000
Subject: [PATCH] Wallpaper for bug 294183 just to reduce the crashing r+sr=bz
 a=bsmedberg

---
 layout/xul/base/src/nsMenuPopupFrame.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index c389502b7b72..38866ebd4789 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -1375,7 +1375,8 @@ NS_IMETHODIMP nsMenuPopupFrame::SetCurrentMenuItem(nsIMenuFrame* aMenuItem)
     PRBool isOpen = PR_FALSE;
     mCurrentMenu->MenuIsOpen(isOpen);
     mCurrentMenu->SelectMenu(PR_FALSE);
-    if (isOpen) {
+    // XXX bug 294183 sometimes mCurrentMenu gets cleared
+    if (mCurrentMenu && isOpen) {
       // Don't close up immediately.
       // Kick off a close timer.
       KillCloseTimer(); // Ensure we don't have another stray waiting closure.