Merge pull request #7709 from m-kuhn/fixRelations

m-kuhn · web-flow · commit 990ddf7cbcef · 2018-08-25T15:42:13.000+02:00
Fix crash when relations would be recursively nested
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -48,7 +48,7 @@ void QgsRelationWidgetWrapper::setVisible( bool visible )
 
 void QgsRelationWidgetWrapper::aboutToSave()
 {
-  if ( !mRelation.isValid() )
+  if ( !mRelation.isValid() || !widget() || !widget()->isVisible() )
     return;
 
   // Calling isModified() will emit a beforeModifiedCheck()

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void QgsRelationWidgetWrapper::setVisible( bool visible )`
`48`	`48`
`49`	`49`	`void QgsRelationWidgetWrapper::aboutToSave()`
`50`	`50`	`{`
`51`		`- if ( !mRelation.isValid() )`
	`51`	`+ if ( !mRelation.isValid() \|\| !widget() \|\| !widget()->isVisible() )`
`52`	`52`	`return;`
`53`	`53`
`54`	`54`	`// Calling isModified() will emit a beforeModifiedCheck()`