Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash (but not hang) when Gecko alert opens above Cocoa modal Save As dialog. b=468393 r=josh sr=roc

Browse Source
This commit is contained in:
Steven Michaud 2009-01-23 14:46:35 -06:00
parent ccf93ca8cb
commit 77280dc541
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/src/cocoa/nsMenuUtilsX.mm
View File

@ -130,15 +130,17 @@ nsMenuBarX* nsMenuUtilsX::GetHiddenWindowMenuBar()
// It would be nice if we could localize these edit menu names.
static NSMenuItem* standardEditMenuItem = nil;
NSMenuItem* nsMenuUtilsX::GetStandardEditMenuItem()
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (standardEditMenuItem)
return standardEditMenuItem;
standardEditMenuItem = [[NSMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:@""];
// In principle we should be able to allocate this once and then always
// return the same object. But wierd interactions happen between native
// app-modal dialogs and Gecko-modal dialogs that open above them. So what
// we return here isn't always released before it needs to be added to
// another menu. See bmo bug 468393.
NSMenuItem* standardEditMenuItem =
[[[NSMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:@""] autorelease];
NSMenu* standardEditMenu = [[NSMenu alloc] initWithTitle:@"Edit"];
[standardEditMenuItem setSubmenu:standardEditMenu];
[standardEditMenu release];