From 6bc10cbc95fb2063e239c08de4cfaae12ce3bfeb Mon Sep 17 00:00:00 2001 From: roytam1 Date: Tue, 9 Nov 2021 21:07:58 +0800 Subject: [PATCH] Bug 1730048, reorder the code in nsMenuFrame::PassMenuCommandEventToPopupManager a bit, r=mstange a=RyanVM --- layout/xul/nsMenuFrame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layout/xul/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp index 087323a875..30cab242ea 100644 --- a/layout/xul/nsMenuFrame.cpp +++ b/layout/xul/nsMenuFrame.cpp @@ -1273,7 +1273,9 @@ nsMenuFrame::PassMenuCommandEventToPopupManager() nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); nsMenuParent* menuParent = GetMenuParent(); if (pm && menuParent && mDelayedMenuCommandEvent) { - pm->ExecuteMenu(mContent, mDelayedMenuCommandEvent); + nsCOMPtr content = mContent; + RefPtr event = mDelayedMenuCommandEvent; + pm->ExecuteMenu(content, event); } mDelayedMenuCommandEvent = nullptr; }