From a5d9a706a65a9787868297eb79a91d47539b046b Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Fri, 29 May 2015 18:31:41 +0200
Subject: Prevent crash if QWindow::screen() is null

Reviewed by Handa
---
 src/gui/kwindowconfig.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gui/kwindowconfig.cpp b/src/gui/kwindowconfig.cpp
index 60fe89ed..a32c6cce 100644
--- a/src/gui/kwindowconfig.cpp
+++ b/src/gui/kwindowconfig.cpp
@@ -29,7 +29,8 @@ static const char s_initialScreenSizePropertyName[] = "_kconfig_initial_screen_s
 
 void KWindowConfig::saveWindowSize(const QWindow *window, KConfigGroup &config, KConfigGroup::WriteConfigFlags options)
 {
-    if (!window) {
+    // QWindow::screen() shouldn't return null, but it sometimes does due to bugs.
+    if (!window || !window->screen()) {
         return;
     }
     const QRect desk = window->screen()->geometry();
-- 
cgit v1.2.1