From b8ac163c422b3d8f12d91b92f126a631449a2232 Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@theqtcompany.com>
Date: Tue, 2 Dec 2014 23:28:59 +0100
Subject: Fix possible null pointer access.

Task-number: QTIFW-593
Change-Id: I583cf4cb63abc9ecad9acf09b5573d380d852b30
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---
 src/libs/installer/packagemanagergui.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index a09f8090d..e3dc65d58 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -985,8 +985,10 @@ bool IntroductionPage::validatePage()
     }
 
 #ifdef Q_OS_WIN
-    if (!m_taskButton->window())
-        m_taskButton->setWindow(QApplication::activeWindow()->windowHandle());
+    if (!m_taskButton->window()) {
+        if (QWidget *widget = QApplication::activeWindow())
+            m_taskButton->setWindow(widget->windowHandle());
+    }
 
     m_taskButton->progress()->reset();
     m_taskButton->progress()->resume();
-- 
cgit v1.2.3