From 76c22f3e06fd1a7f4338223a4169daa6f043efb7 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 24 Oct 2019 16:27:54 +0200 Subject: [PATCH] follow-up a0ec2690cf0a1c36bc468fbfb5aec1954eff72ae --- electrum/gui/qt/main_window.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py index dc64481a6..afa577701 100644 --- a/electrum/gui/qt/main_window.py +++ b/electrum/gui/qt/main_window.py @@ -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() @@ -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()