From 664fcc0e554d496890609f04869bdac66bebd7c0 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 Jan 2005 23:59:12 +0000
Subject: [PATCH] Fix deleting active menuitem from crashing b=250276 p=vlad
 r=ben sr=shaver a=asa

git-svn-id: svn://10.0.0.236/trunk@167409 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/xul/base/src/nsMenuFrame.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
index 418546eefd6..cb7b5388c86 100644
--- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
@@ -335,6 +335,16 @@ nsMenuFrame::DestroyPopupFrames(nsPresContext* aPresContext)
 NS_IMETHODIMP
 nsMenuFrame::Destroy(nsPresContext* aPresContext)
 {
+  // are we our menu parent's current menu item?
+  if (mMenuParent) {
+    nsIMenuFrame *curItem = nsnull;
+    mMenuParent->GetCurrentMenuItem(&curItem);
+    if (curItem == this) {
+      // yes; tell it that we're going away
+      mMenuParent->SetCurrentMenuItem(nsnull);
+    }
+  }
+
   DestroyPopupFrames(aPresContext);
   return nsBoxFrame::Destroy(aPresContext);
 }