keep old value when asked to set an invalid value in relation ref widget

qgis · Feb 25, 2016 · cc19a578181807a7394d3dfdc36d8008380aa572 · cc19a57
1 parent 5f157a9
commit cc19a578181807a7394d3dfdc36d8008380aa572
Unified Split

Showing with 5 additions and 2 deletions.

+5 −2 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -234,7 +234,11 @@ void QgsRelationReferenceWidget::setRelationEditable( bool editable )
 
 void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
 {
-  if ( !value.isValid() || value.isNull() )
+  if ( !value.isValid() )
+  {
+    return;
+  }
+  if ( value.isNull() )
   {
     deleteForeignKey();
     return;
@@ -254,7 +258,6 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
 
   if ( !mFeature.isValid() )
   {
-    deleteForeignKey();
     return;
   }