From 071bd23bf997a3efba1e8aa42c4d4ca431771bcf Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 2 Dec 2024 15:30:04 +0100 Subject: [PATCH] LanguageClient: check project before accessing project setting Change-Id: I48842fc6cfc4bdff33411fbe0fed4f4a704c0125 Reviewed-by: Sami Shalayel --- .../languageclient/languageclientsettings.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index 8a151cb1119..29abe9ba9c4 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -596,12 +596,13 @@ Client *BaseSettings::createClient() const bool BaseSettings::isEnabledOnProject(ProjectExplorer::Project *project) const { - LanguageClient::ProjectSettings settings(project); - if (settings.enabledSettings().contains(m_id)) - return true; - if (settings.disabledSettings().contains(m_id)) - return false; - + if (project) { + LanguageClient::ProjectSettings settings(project); + if (settings.enabledSettings().contains(m_id)) + return true; + if (settings.disabledSettings().contains(m_id)) + return false; + } return m_enabled; }