Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #37744 from m-kuhn/fix_offline_editing_with_aux_st…
…orage

Add safety check
  • Loading branch information
m-kuhn committed Jul 11, 2020
2 parents 053d504 + 4f5bb6f commit 06fea4f
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/core/qgsvectorlayerjoininfo.cpp
Expand Up @@ -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() );
}
}
}
}
Expand Down

0 comments on commit 06fea4f

Please sign in to comment.