Skip to content

Commit

Permalink
Merge features: Fix "take attributes from selected feature"
Browse files Browse the repository at this point in the history
Fix #7668
Fix #7922
  • Loading branch information
m-kuhn committed Jul 4, 2013
1 parent b7d7076 commit e53aa07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/app/qgsmergeattributesdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
}
else //an existing feature value
{
int featureId = mergeBehaviourString.split( " " ).at( 1 ).toInt(); //probably not very robust for translations...
int featureId = mergeBehaviourString.split( " " ).value( 1 ).toInt(); //probably not very robust for translations...
mergeResult = featureAttribute( featureId, col );
}

Expand Down Expand Up @@ -488,7 +488,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()
QComboBox* currentComboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, i ) );
if ( currentComboBox )
{
currentComboBox->setCurrentIndex( currentComboBox->findText( tr( "feature %1" ).arg( featureId ) ) );
currentComboBox->setCurrentIndex( currentComboBox->findText( tr( "Feature %1" ).arg( featureId ) ) );
}
}
}
Expand Down

0 comments on commit e53aa07

Please sign in to comment.