Mercurial > hg > bitcoin

changeset 1891:50dc7cd09977 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Wladimir J. van der Laan <laanwj@gmail.com>
date Mon, 20 Feb 2012 08:55:49 -0800
parents 945363068a0d (current diff) 3be37a68e1ac (diff)
children 67eee6b747c8
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -59,8 +59,9 @@
 {
     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)
 {