Fix crash in relation reference widget

m-kuhn · m-kuhn · commit 69eb65973045 · 2015-11-19T12:32:39.000+01:00
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -353,7 +353,7 @@ QVariant QgsRelationReferenceWidget::foreignKey()
   {
     if ( !mFeature.isValid() )
     {
-      return QVariant( mReferencingLayer->fields().at( mFkeyFieldIdx ).type() );
+      return QVariant( mReferencingLayer->fields().at( mReferencingLayer->fieldNameIndex( mRelation.fieldPairs().at( 0 ).first ) ).type() );
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ QVariant QgsRelationReferenceWidget::foreignKey()`
`353`	`353`	`{`
`354`	`354`	`if ( !mFeature.isValid() )`
`355`	`355`	`{`
`356`		`- return QVariant( mReferencingLayer->fields().at( mFkeyFieldIdx ).type() );`
	`356`	`+ return QVariant( mReferencingLayer->fields().at( mReferencingLayer->fieldNameIndex( mRelation.fieldPairs().at( 0 ).first ) ).type() );`
`357`	`357`	`}`
`358`	`358`	`else`
`359`	`359`	`{`