Merge pull request #7282

621bd69 [Qt] fix coincontrol update issue when deleting a send coin entry (Jonas Schnelli)
This commit is contained in:
Jonas Schnelli 2016-01-05 13:01:40 +01:00
commit aa413687de
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
1 changed files with 3 additions and 3 deletions

View File

@ -373,8 +373,6 @@ SendCoinsEntry *SendCoinsDialog::addEntry()
connect(entry, SIGNAL(payAmountChanged()), this, SLOT(coinControlUpdateLabels()));
connect(entry, SIGNAL(subtractFeeFromAmountChanged()), this, SLOT(coinControlUpdateLabels()));
updateTabsAndLabels();
// Focus the field, so that entry can start immediately
entry->clear();
entry->setFocus();
@ -383,6 +381,8 @@ SendCoinsEntry *SendCoinsDialog::addEntry()
QScrollBar* bar = ui->scrollArea->verticalScrollBar();
if(bar)
bar->setSliderPosition(bar->maximum());
updateTabsAndLabels();
return entry;
}
@ -808,7 +808,7 @@ void SendCoinsDialog::coinControlUpdateLabels()
for(int i = 0; i < ui->entries->count(); ++i)
{
SendCoinsEntry *entry = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(i)->widget());
if(entry)
if(entry && !entry->isHidden())
{
SendCoinsRecipient rcp = entry->getValue();
CoinControlDialog::payAmounts.append(rcp.amount);