Merge pull request #46513 from nirvn/crash_fix

Follow up PR #46505: fix crasher
qgis · Dec 16, 2021 · dd83635 · dd83635
2 parents 41801d9 + 3d3fbab
commit dd83635
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/gui/qgsexpressiontreeview.cpp b/src/gui/qgsexpressiontreeview.cpp
@@ -423,8 +423,11 @@ void QgsExpressionTreeView::loadLayers()
 
 void QgsExpressionTreeView::loadLayerFields( QgsVectorLayer *layer, QgsExpressionItem *parentItem )
 {
-  const QgsFields fields { layer->fields() };
-  for ( int fieldIdx = 0; fieldIdx < layer->fields().count(); ++fieldIdx )
+  if ( !layer )
+    return;
+
+  const QgsFields fields = layer->fields();
+  for ( int fieldIdx = 0; fieldIdx < fields.count(); ++fieldIdx )
   {
     const QgsField field = fields.at( fieldIdx );
     QIcon icon = fields.iconForField( fieldIdx );