Skip to content

Commit fe0c182

Browse files
committed
cocoa: fix app launching regression on macOS
The regression was introduced by ef7f856 Fixes panda3d#227
1 parent 4c4288f commit fe0c182

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

panda/src/cocoadisplay/cocoaGraphicsPipe.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "cocoaGraphicsBuffer.h"
1616
#include "cocoaGraphicsWindow.h"
1717
#include "cocoaGraphicsStateGuardian.h"
18-
#include "cocoaPandaApp.h"
1918
#include "config_cocoadisplay.h"
2019
#include "frameBufferProperties.h"
2120
#include "displayInformation.h"

panda/src/cocoadisplay/cocoaGraphicsWindow.mm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "cocoaGraphicsStateGuardian.h"
1616
#include "config_cocoadisplay.h"
1717
#include "cocoaGraphicsPipe.h"
18+
#include "cocoaPandaApp.h"
1819

1920
#include "graphicsPipe.h"
2021
#include "keyboardButton.h"
@@ -68,6 +69,8 @@
6869
// Now that we know for sure we want a window, we can create the Cocoa app.
6970
// This will cause the application icon to appear and start bouncing.
7071
if (NSApp == nil) {
72+
[CocoaPandaApp sharedApplication];
73+
7174
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
7275
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
7376
#endif

0 commit comments

Comments
 (0)