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

This commit is contained in:
Kovid Goyal 2019-12-18 20:33:44 +05:30
commit 5bc7cfaa43
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -466,9 +466,8 @@ static GLFWapplicationwillfinishlaunchingfun finish_launching_callback = NULL;
// In case we are unbundled, make us a proper UI application // In case we are unbundled, make us a proper UI application
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
// Menu bar setup must go between sharedApplication above and // Menu bar setup must go between sharedApplication and finishLaunching
// finishLaunching below, in order to properly emulate the behavior // in order to properly emulate the behavior of NSApplicationMain
// of NSApplicationMain
if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"]) if ([[NSBundle mainBundle] pathForResource:@"MainMenu" ofType:@"nib"])
{ {