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

@@ -603,7 +603,7 @@ nsXULPopupManager::HidePopupCallback(nsIContent* aPopup,
                                      nsPopupType aPopupType,
                                      PRBool aDeselectMenu)
 {
-  if (mCloseTimer) {
+  if (mCloseTimer && mTimerMenu == aPopupFrame) {
     mCloseTimer->Cancel();
     mCloseTimer = nsnull;
     mTimerMenu = nsnull;