Fix checkbox status for auxiliary field

qgis · Oct 9, 2017 · 9cb3ff3 · 9cb3ff3
1 parent 9fd80f9
commit 9cb3ff3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -343,13 +343,13 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
 
     mActionCreateAuxiliaryField->setEnabled( true );
     mActionCreateAuxiliaryField->setChecked( false );
-    if ( alayer && alayer->exists( mDefinition ) )
+
+    int index = mVectorLayer->fields().indexFromName( mFieldName );
+    int srcIndex;
+    if ( index >= 0 && alayer && mVectorLayer->isAuxiliaryField( index, srcIndex ) )
     {
-      if ( mProperty.field() == QgsAuxiliaryLayer::nameFromProperty( mDefinition, true ) )
-      {
-        mActionCreateAuxiliaryField->setEnabled( false );
-        mActionCreateAuxiliaryField->setChecked( true );
-      }
+      mActionCreateAuxiliaryField->setEnabled( false );
+      mActionCreateAuxiliaryField->setChecked( true );
     }
   }