Skip to content
Permalink
Browse files

Add safety check

  • Loading branch information
github-actions authored and nyalldawson committed Jul 12, 2020
1 parent fb116cf commit 6250b6fc1af2fa89e52f016c7132c9ea7c93db24
Showing with 11 additions and 1 deletion.
  1. +11 −1 src/core/qgsvectorlayerjoininfo.cpp
@@ -87,11 +87,21 @@ QStringList QgsVectorLayerJoinInfo::joinFieldNamesSubset( const QgsVectorLayerJo
}
else
{
for ( const QgsField &f : info.joinLayer()->fields() )
if ( info.joinLayer() )
{
<<<<<<< HEAD
if ( !info.joinFieldNamesBlackList().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() );
}
>>>>>>> 06fea4ffe4... Merge pull request #37744 from m-kuhn/fix_offline_editing_with_aux_storage
}
}
}

0 comments on commit 6250b6f

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