From b59785c4b55cc45d01a77d1f67b0f5875a906a05 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Tue, 21 Jan 2020 16:24:50 +0100
Subject: GenericProjectManager: Fix crash updating deployment data

Fixes: QTCREATORBUG-23501
Change-Id: Ia36fe567edf26c293a8db2446d1ee2344b96433e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/genericprojectmanager/genericproject.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/plugins/genericprojectmanager')

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 1c280eb4906..384152b454a 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -546,10 +546,12 @@ void GenericProject::updateDeploymentData()
         hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString());
     }
     if (hasDeploymentData) {
-        DeploymentData deploymentData;
-        deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(),
-                                                  projectDirectory().toString());
-        activeTarget()->setDeploymentData(deploymentData);
+        if (activeTarget()) {
+            DeploymentData deploymentData;
+            deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(),
+                                                      projectDirectory().toString());
+            activeTarget()->setDeploymentData(deploymentData);
+        }
         if (m_deployFileWatcher->files() != QStringList(deploymentFilePath.toString())) {
             m_deployFileWatcher->removeFiles(m_deployFileWatcher->files());
             m_deployFileWatcher->addFile(deploymentFilePath.toString(),
-- 
cgit v1.2.3