From 0b1ed791a56fc63a026628c7f2511c6011002f6d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 3 May 2018 13:15:54 +0200 Subject: [PATCH] Project: Fix soft-assert triggered by Qbs projects Soft-assert when a root project node is set again, except when that node is nullptr. Change-Id: Ib7c1891defc79d464a692c0e982b668be9a40cf9 Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/project.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 9d48d2237a6..721b8dc4c7d 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -493,7 +493,7 @@ void Project::setId(Core::Id id) void Project::setRootProjectNode(std::unique_ptr &&root) { - QTC_ASSERT(d->m_rootProjectNode.get() != root.get(), return); + QTC_ASSERT(d->m_rootProjectNode.get() != root.get() || !root, return); if (root && root->isEmpty()) { // Something went wrong with parsing: At least the project file needs to be