From 79428756b281df02b128e2450307041a17b49bd5 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 16 Jun 2022 16:50:25 +0200 Subject: [PATCH] kivy: in event handlers, check wallet. We might receive events before the wallet is loaded. --- electrum/gui/kivy/main_window.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py index 5ff605170..b97a07ed1 100644 --- a/electrum/gui/kivy/main_window.py +++ b/electrum/gui/kivy/main_window.py @@ -267,6 +267,8 @@ class ElectrumWindow(App, Logger): self._trigger_update_history() def on_request_status(self, event, wallet, key, status): + if wallet != self.wallet: + return req = self.wallet.receive_requests.get(key) if req is None: return @@ -282,6 +284,8 @@ class ElectrumWindow(App, Logger): self._trigger_update_history() def on_invoice_status(self, event, wallet, key): + if wallet != self.wallet: + return req = self.wallet.get_invoice(key) if req is None: return @@ -296,11 +300,15 @@ class ElectrumWindow(App, Logger): self.invoice_popup.update_status() def on_payment_succeeded(self, event, wallet, key): + if wallet != self.wallet: + return description = self.wallet.get_label(key) self.show_info(_('Payment succeeded') + '\n\n' + description) self._trigger_update_history() def on_payment_failed(self, event, wallet, key, reason): + if wallet != self.wallet: + return self.show_info(_('Payment failed') + '\n\n' + reason) def _get_bu(self):