Skip to content

Commit e53aa07

Browse files
committed
Merge features: Fix "take attributes from selected feature"
Fix #7668 Fix #7922
1 parent b7d7076 commit e53aa07

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/app/qgsmergeattributesdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
274274
}
275275
else //an existing feature value
276276
{
277-
int featureId = mergeBehaviourString.split( " " ).at( 1 ).toInt(); //probably not very robust for translations...
277+
int featureId = mergeBehaviourString.split( " " ).value( 1 ).toInt(); //probably not very robust for translations...
278278
mergeResult = featureAttribute( featureId, col );
279279
}
280280

@@ -488,7 +488,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()
488488
QComboBox* currentComboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, i ) );
489489
if ( currentComboBox )
490490
{
491-
currentComboBox->setCurrentIndex( currentComboBox->findText( tr( "feature %1" ).arg( featureId ) ) );
491+
currentComboBox->setCurrentIndex( currentComboBox->findText( tr( "Feature %1" ).arg( featureId ) ) );
492492
}
493493
}
494494
}

0 commit comments

Comments
 (0)