From 60384bd8c8eb20d9162400861eda7c4cb4487251 Mon Sep 17 00:00:00 2001
From: "enndeakin@sympatico.ca" <enndeakin@sympatico.ca>
Date: Mon, 29 Oct 2007 10:26:19 -0700
Subject: [PATCH] Bug 396863, check the menu to ensure that the timer is for
 the right one, prevents multiple submenus from appearing, r+sr=roc,a=beltzner

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

diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index d198691b0050..bf1bfcf7dcb3 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -603,7 +603,7 @@ nsXULPopupManager::HidePopupCallback(nsIContent* aPopup,
                                      nsPopupType aPopupType,
                                      PRBool aDeselectMenu)
 {
-  if (mCloseTimer) {
+  if (mCloseTimer && mTimerMenu == aPopupFrame) {
     mCloseTimer->Cancel();
     mCloseTimer = nsnull;
     mTimerMenu = nsnull;