From ab4f6ad9ce9f7f83857d8b09326ea57d1b521703 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 28 Nov 2018 13:38:11 +0100
Subject: [PATCH] QbsProjectManager: Fix race condition on target switch

(cherry picked from commit 77c729bb8a315dc596d111bddabf0b510094f7cc)
Fixes: QTCREATORBUG-21544
Change-Id: I2a29e17ad1fd37049db16634f16e8c6916cb1093
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index a1df7d2e2ce..6b280eb5b93 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -1126,6 +1126,8 @@ void QbsProject::updateApplicationTargets()
         bti.usesTerminal = usesTerminal;
         bti.displayName = productData.fullDisplayName();
         bti.runEnvModifier = [targetFile, productData, this](Utils::Environment &env, bool usingLibraryPaths) {
+            if (!qbsProject().isValid())
+                return;
             QProcessEnvironment procEnv = env.toProcessEnvironment();
             procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), targetFile);
             QStringList setupRunEnvConfig;