Merge pull request #5774 from pblottiere/bugfix_ref_rel_null

[bugfix] Fixes crash in QgsRelationReferenceWidget
qgis · Dec 5, 2017 · aa68a9f · aa68a9f
2 parents 1cd8b94 + 7c2732d
commit aa68a9f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -267,7 +267,8 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant &value )
 
       mReferencedLayer->getFeatures( request ).nextFeature( mFeature );
 
-      for ( int i = 0; i < mFilterFields.size(); i++ )
+      const int count = std::min( mFilterComboBoxes.size(), mFilterFields.size() );
+      for ( int i = 0; i < count; i++ )
       {
         QVariant v = mFeature.attribute( mFilterFields[i] );
         QString f = v.isNull() ? nullValue.toString() : v.toString();