[tor-commits] [tor-browser/tor-browser-78.12.0esr-10.5-1] Bug 31607: App menu items stop working on macOS

[sysrqb at torproject.org]

commit 8e00e8da0bc9705ba79b9788584bf8f04394070d
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu Oct 3 10:53:43 2019 -0400

    Bug 31607: App menu items stop working on macOS
    
    Avoid re-creating the hidden window, since this causes the nsMenuBarX
    object that is associated with the app menu to be freed (which in
    turn causes all of the app menu items to stop working).
    
    More detail: There should only be one hidden window.
    XREMain::XRE_mainRun() contains an explicit call to create the
    hidden window and that is the normal path by which it is created.
    However, when Tor Launcher's wizard/progress window is opened during
    startup, a hidden window is created earlier as a side effect of
    calls to nsAppShellService::GetHiddenWindow(). Then, when
    XREMain::XRE_mainRun() creates its hidden window, the original one
    is freed which also causes the app menu's nsMenuBarX object which
    is associated with that window to be destroyed. When that happens,
    the menuGroupOwner property within each Cocoa menu items's MenuItemInfo
    object is cleared. This breaks the link that is necessary for
    NativeMenuItemTarget's menuItemHit method to dispatch a menu item
    event.
---
 xpfe/appshell/nsAppShellService.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
index 719684ceb072..1600a3fea789 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -93,6 +93,10 @@ void nsAppShellService::EnsureHiddenWindow() {
 
 NS_IMETHODIMP
 nsAppShellService::CreateHiddenWindow() {
+  if (mHiddenWindow) {
+    return NS_OK;
+  }
+
   if (!XRE_IsParentProcess()) {
     return NS_ERROR_NOT_IMPLEMENTED;
   }