From fe0c1828301f376317066ae01e28aba32bb8463f Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 17 Jan 2018 19:46:30 +0100 Subject: [PATCH] cocoa: fix app launching regression on macOS The regression was introduced by ef7f856c46299f4d14711130269f11afad49e4c3 Fixes #227 --- panda/src/cocoadisplay/cocoaGraphicsPipe.mm | 1 - panda/src/cocoadisplay/cocoaGraphicsWindow.mm | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/panda/src/cocoadisplay/cocoaGraphicsPipe.mm b/panda/src/cocoadisplay/cocoaGraphicsPipe.mm index 0baa94f8ed..5430373c55 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsPipe.mm +++ b/panda/src/cocoadisplay/cocoaGraphicsPipe.mm @@ -15,7 +15,6 @@ #include "cocoaGraphicsBuffer.h" #include "cocoaGraphicsWindow.h" #include "cocoaGraphicsStateGuardian.h" -#include "cocoaPandaApp.h" #include "config_cocoadisplay.h" #include "frameBufferProperties.h" #include "displayInformation.h" diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm index 426c06cc78..39ecf09162 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm +++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm @@ -15,6 +15,7 @@ #include "cocoaGraphicsStateGuardian.h" #include "config_cocoadisplay.h" #include "cocoaGraphicsPipe.h" +#include "cocoaPandaApp.h" #include "graphicsPipe.h" #include "keyboardButton.h" @@ -68,6 +69,8 @@ CocoaGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, // Now that we know for sure we want a window, we can create the Cocoa app. // This will cause the application icon to appear and start bouncing. if (NSApp == nil) { + [CocoaPandaApp sharedApplication]; + #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; #endif