Merge pull request #858 from laanwj/2012_02_uisendlabelfix
Only fill in label from address book if no label is filled in yet (fixes #840)
This commit is contained in:
commit
7b88a61706
|
@ -59,8 +59,9 @@ void SendCoinsEntry::on_payTo_textChanged(const QString &address)
|
||||||
{
|
{
|
||||||
if(!model)
|
if(!model)
|
||||||
return;
|
return;
|
||||||
ui->addAsLabel->setText(model->getAddressTableModel()->labelForAddress(address));
|
// Fill in label from address book, if no label is filled in yet
|
||||||
}
|
if(ui->addAsLabel->text().isEmpty())
|
||||||
|
ui->addAsLabel->setText(model->getAddressTableModel()->labelForAddress(address));}
|
||||||
|
|
||||||
void SendCoinsEntry::setModel(WalletModel *model)
|
void SendCoinsEntry::setModel(WalletModel *model)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue