New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

1 files changed, 5 insertions, 6 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp
index 781e25e..183f8dd 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp
@@ -144,7 +144,7 @@ void DbDialog::updateOptions()
     setUpdatesEnabled(false);
 
     // Remove olds
-    foreach (QWidget* w, optionWidgets)
+    for (QWidget* w : optionWidgets)
     {
         ui->optionsGrid->removeWidget(w);
         delete w;
@@ -481,7 +481,7 @@ bool DbDialog::validate()
     if (nameState)
     {
         if (nameManuallyEdited)
-            setValidStateInfo(ui->nameEdit, tr("<p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p>"));
+            setValidStateInfo(ui->nameEdit, tr("<p>Automatic name generation was disabled, because the name was edited manually. To restore automatic generation please erase contents of the name field.</p>"));
         else
             setValidState(ui->nameEdit, true);
     }
@@ -560,14 +560,13 @@ void DbDialog::valueForNameGenerationChanged()
         return;
 
     QString generatedName;
-    if (dbPlugins.count() > 0)
-    {
-        DbPlugin* plugin = dbPlugins[ui->typeCombo->currentText()];
+    DbPlugin* plugin = dbPlugins.count() > 0 ? dbPlugins[ui->typeCombo->currentText()] : nullptr;
+    if (plugin)
         generatedName = DBLIST->generateUniqueDbName(plugin, ui->fileEdit->text());
-    }
     else
         generatedName = DBLIST->generateUniqueDbName(ui->fileEdit->text());
 
+
     ui->nameEdit->setText(generatedName);
 }