aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-02-17 18:25:14 +0100
committerLuke Dashjr <luke-jr+git@utopios.org>2012-02-27 12:45:25 -0500
commitb085138f89e93eac900a863e0d1aa14472aa32d3 (patch)
treed7e969c683719312930d8d2d22cb15ae5a75740c
parent33e0c3a8662a11566cbb7bd382b7f6737f8c96a2 (diff)
downloadbitcoin-b085138f89e93eac900a863e0d1aa14472aa32d3.tar.xz
Only fill in label from address book, if no label is filled in yet, fixes #840
-rw-r--r--src/qt/sendcoinsentry.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index ab5460f8c2..d98400c260 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -59,8 +59,9 @@ void SendCoinsEntry::on_payTo_textChanged(const QString &address)
{
if(!model)
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)
{