Skip to content
Permalink
Browse files

Add safety check

  • Loading branch information
github-actions authored and nyalldawson committed Jul 12, 2020
1 parent a9dbc88 commit ecef38f1cd2322342c27e4380b152ffc3decbd0c
Showing with 8 additions and 4 deletions.
  1. +8 −4 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() );
}
}
}
}

0 comments on commit ecef38f

Please sign in to comment.
You can’t perform that action at this time.