From 144194b79aaa705529ec4d550e9869db5aa5436f Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 7 Dec 2023 12:01:55 +0100 Subject: [PATCH] CMakePM: Fix crash when editing CMake files without a project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTCREATORBUG-30023 Change-Id: Id849635dd0e7437d7ae93251130d2f26ded24def Reviewed-by: Kai Köhne --- src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp index 6dc754d2bed..2f7313c4a45 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp @@ -314,7 +314,9 @@ static void updateCMakeConfigurationWithLocalData(CMakeConfig &cmakeCache, return var == "CMAKE_PREFIX_PATH" || var == "CMAKE_MODULE_PATH"; }; - const FilePath projectDir = ProjectTree::currentBuildSystem()->projectDirectory(); + const FilePath projectDir = ProjectTree::currentBuildSystem() + ? ProjectTree::currentBuildSystem()->projectDirectory() + : currentDir; auto updateDirVariables = [currentDir, projectDir, cmakeCache](QByteArray &value) { value.replace("${CMAKE_CURRENT_SOURCE_DIR}", currentDir.path().toUtf8()); value.replace("${CMAKE_CURRENT_LIST_DIR}", currentDir.path().toUtf8());