From 0679671547c4a8c7a69ee295ef690e35e6542e62 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 17 Jun 2019 12:40:20 +0200 Subject: [PATCH] CMake: Better display name in project tree when parsing fails When project parsing fails, then the project node might be non-nullptr but empty. This case is handled in setRootProjectNode(...), where such a node gets discarded (rootProjectNode() will return a nullptr afterwards). In this case, do not use the project name that came in from the parser as it might be wrong. Change-Id: Iec11aa2d88cca7352d957f428aab24b0f1affd49 Reviewed-by: Eike Ziller Reviewed-by: Cristian Adam --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 6c6b9f4c379..b19ac2dfbe8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -317,8 +317,9 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc) auto newRoot = generateProjectTree(m_allFiles); if (newRoot) { - setDisplayName(newRoot->displayName()); setRootProjectNode(std::move(newRoot)); + if (rootProjectNode()) + setDisplayName(rootProjectNode()->displayName()); for (const CMakeBuildTarget &bt : buildTargets) { const QString buildKey = CMakeTargetNode::generateId(bt.sourceDirectory, bt.title);