Danish Eniro search fixed.

[jenirok] / src / gui / settingsdialog.cpp

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 9c40744..2c3ee77 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -163,25 +163,33 @@ void SettingsDialog::saveSettings()
     Settings::instance()->set("autostart", autostart);
     QString connection = connectionSelector_->value().toString();
     Settings::instance()->set("connection", connection);
-    Settings::instance()->set("connection_name", connectionSelector_->text());
     QString language = languageSelector_->value().toString();
     Settings::instance()->set("language", language);
     sourceConfig_->save();
 
     Settings::instance()->endEdit();
 
-    if(Daemon::isRunning())
-    {
-        QMaemo5InformationBox::information(this, tr("Restarting daemon..."), 1500);
-        Daemon::restart();
-    }
+    bool infoboxShown = false;
 
     if(language != selectedLanguage_)
     {
         QMaemo5InformationBox::information(this, tr("You need to restart Jenirok for language change to take effect."));
         selectedLanguage_ = language;
+        infoboxShown = true;
     }
 
+    if(Daemon::isRunning())
+    {
+        if(!infoboxShown)
+        {
+            QMaemo5InformationBox::information(this, tr("Restarting daemon..."), 1500);
+        }
+
+        Daemon::restart();
+    }
+
+    emit saved();
+
 }
 
 void SettingsDialog::resetCache()