aboutsummaryrefslogtreecommitdiff
path: root/src/qt/sendcoinsentry.cpp
diff options
context:
space:
mode:
authorCozz Lovan <cozzlovan@yahoo.com>2014-03-12 17:03:56 +0100
committerCozz Lovan <cozzlovan@yahoo.com>2014-03-12 17:08:00 +0100
commit0fde3bbf077aed29bc1367c34d813e9187770cad (patch)
treed9e271aabc704190f40c1b0de788a13e481dec6a /src/qt/sendcoinsentry.cpp
parent1725e6a01f7fcfb20a4ca256e4e764ff6fe4f126 (diff)
downloadbitcoin-0fde3bbf077aed29bc1367c34d813e9187770cad.tar.xz
[Qt] Fill in label from address book also for URIs
Diffstat (limited to 'src/qt/sendcoinsentry.cpp')
-rw-r--r--src/qt/sendcoinsentry.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index ad8dd7b732..e0f56f8cd2 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -195,8 +195,10 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
ui->messageTextLabel->setVisible(!recipient.message.isEmpty());
ui->messageLabel->setVisible(!recipient.message.isEmpty());
- ui->payTo->setText(recipient.address);
- ui->addAsLabel->setText(recipient.label);
+ ui->addAsLabel->clear();
+ ui->payTo->setText(recipient.address); // this may set a label from addressbook
+ if (!recipient.label.isEmpty()) // if a label had been set from the addressbook, dont overwrite with an empty label
+ ui->addAsLabel->setText(recipient.label);
ui->payAmount->setValue(recipient.amount);
}
}