From 6907c10c5040bf7a05ede30d98b42cca99924e1c Mon Sep 17 00:00:00 2001 From: Matej Knopp Date: Mon, 18 May 2020 00:12:06 +0200 Subject: [PATCH 1/2] Workaround for another crash when waking up --- src/plugins/platforms/cocoa/qcocoascreen.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm index db1ac9cc97..ada57f2a52 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -319,7 +319,11 @@ void QCocoaScreen::update(CGDirectDisplayID displayId) // Some properties are only available via NSScreen NSScreen *nsScreen = nativeScreen(); - Q_ASSERT(nsScreen); + if (!nsScreen) { + qCWarning(lcQpaScreen) << "Couldn't find native screen for display " << displayId << " for screen " << this; + return; + } + // Q_ASSERT(nsScreen); // The reference screen for the geometry is always the primary screen QRectF primaryScreenGeometry = QRectF::fromCGRect(CGDisplayBounds(CGMainDisplayID())); -- 2.24.0