Fix #7993, fields are listed twice in labeling data defined menu

qgis · Jun 3, 2013 · 0192e37 · 0192e37
1 parent 96ae127
commit 0192e37
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -137,9 +137,6 @@ void QgsDataDefinedButton::init( const QgsVectorLayer* vl,
   {
     mDataTypesString = ts.join( ", " );
     mActionDataTypes = new QAction( tr( "Field type: " ) + mDataTypesString, this );
-
-    // list fields and types in submenu, since there may be many
-    mActionDataTypes->setMenu( mFieldsMenu );
   }
 
   if ( mVectorLayer )
@@ -277,6 +274,9 @@ void QgsDataDefinedButton::aboutToShowMenu()
       act->setEnabled( false );
     }
 
+    // list fields and types in submenu, since there may be many
+    mActionDataTypes->setMenu( mFieldsMenu );
+
     mDefineMenu->addSeparator();
   }