diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-04-16 05:41:39 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-04-16 05:41:39 -0700 |
| commit | 7a5452ffb3075c0c2604a76e8e82c2c84a24e62e (patch) | |
| tree | 37598a64b875699cad451fcc6a46d1b9d628dde9 /src | |
| parent | Merge pull request #1091 from Diapolo/GUI-BlockDL (diff) | |
| parent | Set label when selecting an address that already has a label. Fixes #1080. (diff) | |
| download | discoin-7a5452ffb3075c0c2604a76e8e82c2c84a24e62e.tar.xz discoin-7a5452ffb3075c0c2604a76e8e82c2c84a24e62e.zip | |
Merge pull request #1092 from laanwj/2012_04_sendcoins_setlabelfix
When sending coins, set label when selecting address that already has a label
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/sendcoinsentry.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index caffaaeff..c8242d835 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -59,9 +59,11 @@ void SendCoinsEntry::on_payTo_textChanged(const QString &address) { if(!model) return; - // 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));} + // Fill in label from address book, if address has an associated label + QString associatedLabel = model->getAddressTableModel()->labelForAddress(address); + if(!associatedLabel.isEmpty()) + ui->addAsLabel->setText(associatedLabel); +} void SendCoinsEntry::setModel(WalletModel *model) { |