Fix showing warning for restart after language change

Fixes #518
hluk · Jun 19, 2016 · b92b5a6 · b92b5a6
1 parent 551d2e7
commit b92b5a6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/gui/configurationmanager.cpp b/src/gui/configurationmanager.cpp
@@ -481,9 +481,12 @@ void ConfigurationManager::apply()
     // Language changes after restart.
     const int newLocaleIndex = ui->comboBoxLanguage->currentIndex();
     const QString newLocaleName = ui->comboBoxLanguage->itemData(newLocaleIndex).toString();
-    settings.setValue("Options/language", newLocaleName);
+    const QString oldLocaleName = settings.value("Options/language").toString();
     const QLocale oldLocale;
-    if (QLocale(newLocaleName).name() != oldLocale.name()) {
+
+    settings.setValue("Options/language", newLocaleName);
+
+    if (QLocale(newLocaleName).name() != oldLocale.name() && newLocaleName != oldLocaleName) {
         QMessageBox::information( this, tr("Restart Required"),
                                   tr("Language will be changed after application is restarted.") );
     }