do not store recursively

this avoids having an endless loop -> crash
qgis · Sep 13, 2018 · f7f36cd · f7f36cd
1 parent 23f1e43
commit f7f36cd
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -48,6 +48,19 @@ void QgsRelationWidgetWrapper::setVisible( bool visible )
 
 void QgsRelationWidgetWrapper::aboutToSave()
 {
+  // If this widget is already embedded by the same relation return
+  const QgsAttributeEditorContext *ctx = &context();
+  do
+  {
+    if ( ( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )
+         || ( mNmRelation.isValid() && ctx->relation().name() == mNmRelation.name() ) )
+    {
+      return;
+    }
+    ctx = ctx->parentContext();
+  }
+  while ( ctx );
+
   if ( !mRelation.isValid() || !widget() || !widget()->isVisible() )
     return;