This commit is contained in:
ThomasV 2015-11-24 11:13:48 +01:00
parent c6780cce84
commit f09d80459d
1 changed files with 4 additions and 9 deletions

View File

@ -1379,16 +1379,11 @@ class ElectrumWindow(QMainWindow, PrintError):
amount = out.get('amount') amount = out.get('amount')
label = out.get('label') label = out.get('label')
message = out.get('message') message = out.get('message')
if label: # use label as description (not BIP21 compliant)
if self.wallet.labels.get(address) != label: if label and not message:
if self.question(_('Save label "%(label)s" for address %(address)s ?'%{'label':label,'address':address})): message = label
if address not in self.wallet.addressbook and not self.wallet.is_mine(address):
self.wallet.addressbook.append(address)
self.wallet.set_label(address, label)
else:
label = self.wallet.labels.get(address)
if address: if address:
self.payto_e.setText(label + ' <'+ address +'>' if label else address) self.payto_e.setText(address)
if message: if message:
self.message_e.setText(message) self.message_e.setText(message)
if amount: if amount: