Fix subform for relations are not shown

m-kuhn · m-kuhn · commit adc811ca98b0 · 2016-03-17T14:24:20.000+01:00
Followup 3fd3dae Fix #14515
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -66,7 +66,7 @@ void QgsRelationWidgetWrapper::initWidget( QWidget* editor )
   do
   {
     if (( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )
-        || ctx->relation().name() == nmrel.name() )
+        || ( nmrel.isValid() && ctx->relation().name() == nmrel.name() ) )
     {
       w->setVisible( false );
       break;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ void QgsRelationWidgetWrapper::initWidget( QWidget* editor )`
`66`	`66`	`do`
`67`	`67`	`{`
`68`	`68`	`if (( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )`
`69`		`- \|\| ctx->relation().name() == nmrel.name() )`
	`69`	`+ \|\| ( nmrel.isValid() && ctx->relation().name() == nmrel.name() ) )`
`70`	`70`	`{`
`71`	`71`	`w->setVisible( false );`
`72`	`72`	`break;`