Skip to content

Commit

Permalink
Fix #7993, fields are listed twice in labeling data defined menu
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed Jun 3, 2013
1 parent 96ae127 commit 0192e37
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/gui/qgsdatadefinedbutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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();
}

Expand Down

0 comments on commit 0192e37

Please sign in to comment.