From ff61ed69d39dcfe9ffffb5a3b263c32f834f9ec5 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Jan 2020 16:54:17 +0100 Subject: [PATCH] Fix crash when running a qmlproject A qmlproject does not have an activeBuildConfiguration. Change-Id: Ia36137e88144789779f0c89c1b0f29c8441d088b Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/buildmanager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 6a46d77b7dc..e1bc5b2b008 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -327,7 +327,8 @@ BuildForRunConfigStatus BuildManager::potentiallyBuildForRunConfig(RunConfigurat if (!isBuilding()) { switch (settings.buildBeforeDeploy) { case BuildBeforeRunMode::AppOnly: - rc->target()->activeBuildConfiguration()->restrictNextBuild(rc); + if (rc->target()->activeBuildConfiguration()) + rc->target()->activeBuildConfiguration()->restrictNextBuild(rc); Q_FALLTHROUGH(); case BuildBeforeRunMode::WholeProject: stepIds << Id(Constants::BUILDSTEPS_BUILD); @@ -342,7 +343,8 @@ BuildForRunConfigStatus BuildManager::potentiallyBuildForRunConfig(RunConfigurat Project * const pro = rc->target()->project(); int queueCount = queue(SessionManager::projectOrder(pro), stepIds, rc); - rc->target()->activeBuildConfiguration()->restrictNextBuild(nullptr); + if (rc->target()->activeBuildConfiguration()) + rc->target()->activeBuildConfiguration()->restrictNextBuild(nullptr); if (queueCount < 0) return BuildForRunConfigStatus::BuildFailed;