changeset 1861:3be37a68e1ac draft

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 Fri, 17 Feb 2012 18:25:14 +0100
parents abe71ced7c8c
children 50dc7cd09977
files src/qt/sendcoinsentry.cpp
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)
 {