From 8761b7c20c13858b1c2bb759f32f4e1be282aa60 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 17 Aug 2023 13:34:38 +0200
Subject: [PATCH] LanguageClient: Fix settings loading

Amends de247bff2b15a9eb1eaece9077abecd4369176ba

Change-Id: Iab31da31058247a20451eeb2427152caab02c594
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/languageclient/languageclientsettings.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index 650b450a5d3..349a84f7b88 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -120,16 +120,15 @@ public:
         applyCurrentSettings();
         LanguageClientManager::applySettings();
 
-        for (BaseSettings *setting : m_model.removed()) {
+        for (BaseSettings *setting : m_settings.removed()) {
             for (Client *client : LanguageClientManager::clientsForSetting(setting))
                 LanguageClientManager::shutdownClient(client);
         }
 
         int row = currentRow();
-        m_model.reset(LanguageClientManager::currentSettings());
+        m_settings.reset(LanguageClientManager::currentSettings());
         resetCurrentSettings(row);
     }
-
     void finish()
     {
         m_settings.reset(LanguageClientManager::currentSettings());
@@ -148,7 +147,6 @@ private:
 
     LanguageClientSettingsModel &m_settings;
     QSet<QString> &m_changedSettings;
-    LanguageClientSettingsModel m_model;
 };
 
 QMap<Utils::Id, ClientType> &clientTypes()
@@ -302,8 +300,6 @@ LanguageClientSettingsPage::LanguageClientSettingsPage()
 void LanguageClientSettingsPage::init()
 {
     m_model.reset(LanguageClientSettings::fromSettings(Core::ICore::settings()));
-    apply();
-    finish();
 }
 
 QList<BaseSettings *> LanguageClientSettingsPage::settings() const
@@ -603,6 +599,7 @@ static LanguageClientSettingsPage &settingsPage()
 void LanguageClientSettings::init()
 {
     settingsPage().init();
+    LanguageClientManager::applySettings();
 }
 
 QList<BaseSettings *> LanguageClientSettings::fromSettings(QSettings *settingsIn)