Merge branch 'undo_commenting_out' of https://github.com/Luflosi/kitty

This commit is contained in:
Kovid Goyal 2019-11-24 18:08:14 +05:30
commit c140e17a6f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -470,14 +470,13 @@ static GLFWapplicationwillfinishlaunchingfun finish_launching_callback = NULL;
// finishLaunching below, in order to properly emulate the behavior
// of NSApplicationMain
// disabled by Kovid
/* if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])
if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])
{
[[NSBundle mainBundle] loadNibNamed:@"MainMenu"
owner:NSApp
topLevelObjects:&_glfw.ns.nibObjects];
}
else */
else
createMenuBar();
}
if (finish_launching_callback)