diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-02-20 08:55:49 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-02-20 08:55:49 -0800 |
| commit | 7b88a617067e28ac1ab329257fc6d117453b1904 (patch) | |
| tree | d6e2528d69dfdb40fcf46b6dc84708e1a4f30ef9 | |
| parent | f50f36d4dbf9834fd722f8da9e950d0cd874145f (diff) | |
| parent | f9f75f320eedbc33f80f3978703db72dca76a94b (diff) | |
| download | bitcoin-7b88a617067e28ac1ab329257fc6d117453b1904.tar.xz | |
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)
| -rw-r--r-- | src/qt/sendcoinsentry.cpp | 5 |
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) { |