From 9f1a9078c296d3047b3f9397a0c428e513dda9ce Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 16 Mar 2017 15:25:13 +0100 Subject: [PATCH] CMake: Fix possible crash before the project is fully set up Change-Id: Iacbf49e296a72176ae828fa11286432212078694 Reviewed-by: Ulf Hermann --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 9339591c939..7310697596c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -310,13 +310,15 @@ QString CMakeProject::displayName() const QStringList CMakeProject::files(FilesMode fileMode) const { QStringList result; - rootProjectNode()->forEachNode([&](const FileNode *fn) { - const bool isGenerated = fn->isGenerated(); - if (fileMode == Project::SourceFiles && !isGenerated) - result.append(fn->filePath().toString()); - if (fileMode == Project::GeneratedFiles && isGenerated) - result.append(fn->filePath().toString()); - }); + if (ProjectNode *rpn = rootProjectNode()) { + rpn->forEachNode([&](const FileNode *fn) { + const bool isGenerated = fn->isGenerated(); + if (fileMode == Project::SourceFiles && !isGenerated) + result.append(fn->filePath().toString()); + if (fileMode == Project::GeneratedFiles && isGenerated) + result.append(fn->filePath().toString()); + }); + } return result; }