From f68604a3f5b8a1fdd9f78dc732b182ea6b0b6055 Mon Sep 17 00:00:00 2001 From: LD Date: Sun, 5 Jan 2020 21:25:04 +0100 Subject: [PATCH] cocoadisplay: Fix regression introduced by 45461e667a84b793048db0092596b5c23dbe6b38 Closes #829 --- panda/src/cocoadisplay/cocoaGraphicsWindow.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm index a14f099d3e..6f4689bda0 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm +++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm @@ -1131,7 +1131,9 @@ find_display_mode(int width, int height) { } #endif CFArrayRef modes = CGDisplayCopyAllDisplayModes(_display, options); - CFRelease(options); + if (options != NULL) { + CFRelease(options); + } size_t num_modes = CFArrayGetCount(modes); CGDisplayModeRef mode; @@ -1166,12 +1168,12 @@ find_display_mode(int width, int height) { // As explained above, we want to select the fullscreen display mode using // the same scaling factor, but only for MacOS 10.15+ To do this we check - // the mode width and heightbut also actual pixel widh and height. + // the mode width and height but also actual pixel widh and height. if (CGDisplayModeGetWidth(mode) == width && CGDisplayModeGetHeight(mode) == height && CGDisplayModeGetRefreshRate(mode) == refresh_rate && #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 - (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_14 || + (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_14 || (CGDisplayModeGetPixelWidth(mode) == expected_pixel_width && CGDisplayModeGetPixelHeight(mode) == expected_pixel_height)) && #endif