1 files changed, 4 insertions, 3 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/bindparamsdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/bindparamsdialog.cpp
index 1d7ba66..90f816f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/bindparamsdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/bindparamsdialog.cpp
@@ -44,20 +44,21 @@ void BindParamsDialog::init()
 void BindParamsDialog::initEditors()
 {
     QStringList paramNames;
-    for (BindParam* param : bindParams)
+    for (BindParam*& param : bindParams)
         paramNames << param->originalName;
 
     MultiEditor* firstEditor = nullptr;
     MultiEditor* multiEditor = nullptr;
     QVector<QPair<QString, QVariant>> paramHistory = CFG->getBindParamHistory(paramNames);
-    for (BindParam* param : bindParams)
+    for (BindParam*& param : bindParams)
     {
         multiEditor = initEditor(param, paramHistory.size() > param->position ? paramHistory[param->position].second : QVariant());
         if (firstEditor == nullptr)
             firstEditor = multiEditor;
     }
 
-    firstEditor->focusThisEditor();
+    if (firstEditor)
+        firstEditor->focusThisEditor();
 }
 
 MultiEditor* BindParamsDialog::initEditor(BindParam* param, const QVariant& cachedValue)