From 955105b7904bc1417797fe1e200ec13aa9d82ff3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 4 Jul 2018 11:06:24 +0200 Subject: [PATCH] ProjectExplorer: Fix handling of the QTC_USER_FILE_PATH variable Add a quick check whether the variable is set and return nullopt in that case. Flip the check in the below code. Change-Id: I655662f2940946150165107a66c003a3a4bc025d Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/userfileaccessor.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp index 17ab86214e7..8b40e798c3c 100644 --- a/src/plugins/projectexplorer/userfileaccessor.cpp +++ b/src/plugins/projectexplorer/userfileaccessor.cpp @@ -342,10 +342,9 @@ static QString generateSuffix(const QString &suffix) static inline Utils::optional defineExternalUserFileDir() { static const char userFilePathVariable[] = "QTC_USER_FILE_PATH"; - static QString userFilePath = QFile::decodeName(qgetenv(userFilePathVariable)); - if (userFilePath.isEmpty()) - return QString(); - const QFileInfo fi(userFilePath); + if (Q_LIKELY(!qEnvironmentVariableIsSet(userFilePathVariable))) + return nullopt; + const QFileInfo fi(QFile::decodeName(qgetenv(userFilePathVariable))); const QString path = fi.absoluteFilePath(); if (fi.isDir() || fi.isSymLink()) return path; @@ -395,7 +394,7 @@ static FileName externalUserFilePath(const Utils::FileName &projectFilePath, con FileName result; static const optional externalUserFileDir = defineExternalUserFileDir(); - if (!externalUserFileDir) { + if (externalUserFileDir) { // Recreate the relative project file hierarchy under the shared directory. // PersistentSettingsWriter::write() takes care of creating the path. result = FileName::fromString(externalUserFileDir.value());