Small fix for settings saving.
authoreshe <jessehakanen@gmail.com>
Thu, 17 Jun 2010 20:03:52 +0000 (21:03 +0100)
committereshe <jessehakanen@gmail.com>
Thu, 17 Jun 2010 20:03:52 +0000 (21:03 +0100)
src/gui/settingsdialog.cpp

index ac9d643..44207c6 100644 (file)
@@ -169,14 +169,22 @@ void SettingsDialog::saveSettings()
 
     Settings::instance()->endEdit();
 
+    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;
     }
-    else if(Daemon::isRunning())
+
+    if(Daemon::isRunning())
     {
-        QMaemo5InformationBox::information(this, tr("Restarting daemon..."), 1500);
+        if(!infoboxShown)
+        {
+            QMaemo5InformationBox::information(this, tr("Restarting daemon..."), 1500);
+        }
+
         Daemon::restart();
     }