From dbbe77e19ca48b6bffe73e0e1a434afe322a22d8 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Thu, 15 Mar 2018 13:34:16 +0100
Subject: Avoid crash when there is no QScreen attached to the QWindow

Since QWindow::screen() can return 0 we need to account for this instead
of assuming that it will always be valid.

Task-number: QTBUG-65857
Change-Id: Ifb3a9fdecc76c5c930282101bf383802bf2f2464
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/chromium_overrides.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index 3db107ab1..1bf094a0a 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -82,7 +82,8 @@ namespace QtWebEngineCore {
 void GetScreenInfoFromNativeWindow(QWindow* window, content::ScreenInfo* results)
 {
     QScreen* screen = window->screen();
-
+    if (!screen)
+        return;
     content::ScreenInfo r;
     r.device_scale_factor = screen->devicePixelRatio();
     r.depth_per_component = 8;
-- 
cgit v1.2.3