Add safety check

... or QGIS crashes when offline editing layers with auxiliary storage attached
qgis · Jul 10, 2020 · 4f5bb6f · 4f5bb6f
1 parent b6a9cce
commit 4f5bb6f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/core/qgsvectorlayerjoininfo.cpp b/src/core/qgsvectorlayerjoininfo.cpp
@@ -100,11 +100,15 @@ QStringList QgsVectorLayerJoinInfo::joinFieldNamesSubset( const QgsVectorLayerJo
     }
     else
     {
-      for ( const QgsField &f : info.joinLayer()->fields() )
+      if ( info.joinLayer() )
       {
-        if ( !info.joinFieldNamesBlockList().contains( f.name() )
-             && f.name() != info.joinFieldName() )
-          fieldNames.append( f.name() );
+        const QgsFields fields { info.joinLayer()->fields() };
+        for ( const QgsField &f : fields )
+        {
+          if ( !info.joinFieldNamesBlockList().contains( f.name() )
+               && f.name() != info.joinFieldName() )
+            fieldNames.append( f.name() );
+        }
       }
     }
   }