Improve the automatic key exchange function; fix some known problems;

1 files changed, 8 insertions, 4 deletions

diff --git a/src/ui/settings/SettingsGeneral.cpp b/src/ui/settings/SettingsGeneral.cpp
index 0e9d9de7..b4372506 100644
--- a/src/ui/settings/SettingsGeneral.cpp
+++ b/src/ui/settings/SettingsGeneral.cpp
@@ -43,10 +43,6 @@ GeneralTab::GeneralTab(GpgME::GpgContext *ctx, QWidget *parent)
     serverBoxLayout->addWidget(serverSelectBox);
     serverBoxLayout->addWidget(new QLabel(
             tr("Server that provides short key and key exchange services")));
-    connect(serverSelectBox, QOverload<const QString &>::of(&QComboBox::currentTextChanged),
-            this, [&](const QString &current) -> void {
-                settings.setValue("general/currentGpgfrontendServer", current);
-            });
 
     serverBox->setLayout(serverBoxLayout);
 
@@ -161,9 +157,16 @@ void GeneralTab::setSettings() {
     }
     for (const auto &s : serverList)
         serverSelectBox->addItem(s);
+
+    qDebug() << "currentGpgfrontendServer" << settings.value("general/currentGpgfrontendServer").toString();
     serverSelectBox->setCurrentText(settings.value("general/currentGpgfrontendServer",
                                                    "service.gpgfrontend.pub").toString());
 
+    connect(serverSelectBox, QOverload<const QString &>::of(&QComboBox::currentTextChanged),
+            this, [&](const QString &current) -> void {
+        settings.setValue("general/currentGpgfrontendServer", current);
+    });
+
     // Language setting
     QString langKey = settings.value("int/lang").toString();
     QString langValue = lang.value(langKey);
@@ -201,6 +204,7 @@ void GeneralTab::applySettings() {
     settings.setValue("keys/saveKeyChecked",
                       saveCheckedKeysCheckBox->isChecked());
 
+    qDebug() << "serverSelectBox currentText" << serverSelectBox->currentText();
     settings.setValue("general/currentGpgfrontendServer",
                       serverSelectBox->currentText());