Merge pull request qgis#31393 from seralra96/fix_31292

Improve validation for QgsRelationAddDlg Fixes qgis#31292
a70 · Sep 13, 2019 · ecdc0ea · ecdc0ea
2 parents 635e245 + 7b6a7a1
commit ecdc0ea
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/app/qgsrelationadddlg.cpp b/src/app/qgsrelationadddlg.cpp
@@ -266,8 +266,9 @@ void QgsRelationAddDlg::checkDefinitionValid()
   bool valid = mReferencingLayerCombobox->currentLayer() && mReferencedLayerCombobox->currentLayer();
   for ( int i = 0; i < mFieldPairWidgets.count(); i++ )
   {
-    valid &= mFieldPairWidgets.at( i )->isPairEnabled() || !mFieldPairWidgets.at( i )->referencingField().isNull();
-    valid &= mFieldPairWidgets.at( i )->isPairEnabled() || !mFieldPairWidgets.at( i )->referencedField().isNull();
+    if ( !mFieldPairWidgets.at( i )->isPairEnabled() )
+      continue;
+    valid &= !mFieldPairWidgets.at( i )->referencingField().isNull() && !mFieldPairWidgets.at( i )->referencedField().isNull();
   }
   mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( valid );
 }