tfollow-up a0ec2690cf0a1c36bc468fbfb5aec1954eff72ae - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 76c22f3e06fd1a7f4338223a4169daa6f043efb7
DIR parent 24221584e2f5e97888d38df3a425253b159bf841
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 24 Oct 2019 16:27:54 +0200
follow-up a0ec2690cf0a1c36bc468fbfb5aec1954eff72ae
Diffstat:
M electrum/gui/qt/main_window.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
t@@ -1871,9 +1871,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
except BestEffortRequestFailed as e:
return False, repr(e)
# success
- key = invoice['id']
- txid = tx.txid()
- self.wallet.set_paid(key, txid)
+ if invoice:
+ key = invoice['id']
+ txid = tx.txid()
+ self.wallet.set_paid(key, txid)
+ self.wallet.set_label(txid, invoice['message'])
if pr:
self.payment_request = None
refund_address = self.wallet.get_receiving_address()
t@@ -1889,10 +1891,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
def broadcast_done(result):
# GUI thread
if result:
- status, msg = result
- if status:
- if tx_desc is not None and tx.is_complete():
- self.wallet.set_label(tx.txid(), tx_desc)
+ success, msg = result
+ if success:
parent.show_message(_('Payment sent.') + '\n' + msg)
self.invoice_list.update()
self.do_clear()