Fix loss of checkbox widget settings when a default expression is set

Fixes #18076
qgis · Feb 12, 2018 · 0eda776 · 0eda776
1 parent efdaf5f
commit 0eda776
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -132,7 +132,7 @@ const QVariantMap QgsAttributeTypeDialog::editorWidgetConfig()
   if ( item )
   {
     QString widgetType = item->data( Qt::UserRole ).toString();
-    QgsEditorConfigWidget *cfgWdg = mEditorConfigWidgets[ widgetType ];
+    QgsEditorConfigWidget *cfgWdg = mEditorConfigWidgets.value( widgetType );
     if ( cfgWdg )
     {
       return cfgWdg->config();
@@ -147,7 +147,7 @@ void QgsAttributeTypeDialog::setEditorWidgetType( const QString &type )
 
   mWidgetTypeComboBox->setCurrentIndex( mWidgetTypeComboBox->findData( type ) );
 
-  if ( mEditorConfigWidgets.contains( type ) )
+  if ( mEditorConfigWidgets.contains( type ) && mEditorConfigWidgets.value( type ) /* may be a null pointer */ )
   {
     stackedWidget->setCurrentWidget( mEditorConfigWidgets[type] );
   }