From 07bc4c40ef5ae56fee1b34b7f07e650f983f511e Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 9 Dec 2020 10:22:42 +0100 Subject: [PATCH] kivy: add on_dismiss method to crash reporter dialog --- electrum/gui/kivy/main_window.py | 2 +- electrum/gui/kivy/uix/dialogs/crash_reporter.py | 3 +++ electrum/gui/kivy/uix/dialogs/installwizard.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py index 7bb7ebb84..7ca1d11eb 100644 --- a/electrum/gui/kivy/main_window.py +++ b/electrum/gui/kivy/main_window.py @@ -626,7 +626,7 @@ class ElectrumWindow(App, Logger): self.daemon.add_wallet(wallet) self.load_wallet(wallet) - def on_wizard_aborted(self, wizard): + def on_wizard_aborted(self): # wizard did not return a wallet; and there is no wallet open atm if not self.wallet: self.stop() diff --git a/electrum/gui/kivy/uix/dialogs/crash_reporter.py b/electrum/gui/kivy/uix/dialogs/crash_reporter.py index 1d08ed474..73a37cb71 100644 --- a/electrum/gui/kivy/uix/dialogs/crash_reporter.py +++ b/electrum/gui/kivy/uix/dialogs/crash_reporter.py @@ -131,6 +131,9 @@ class CrashReporter(BaseCrashReporter, Factory.Popup): self.open_url(response["location"]) self.dismiss() + def on_dismiss(self): + self.main_window.on_wizard_aborted() + def open_url(self, url): if platform != 'android': return diff --git a/electrum/gui/kivy/uix/dialogs/installwizard.py b/electrum/gui/kivy/uix/dialogs/installwizard.py index 15d6ee33c..8357831fd 100644 --- a/electrum/gui/kivy/uix/dialogs/installwizard.py +++ b/electrum/gui/kivy/uix/dialogs/installwizard.py @@ -1071,7 +1071,7 @@ class InstallWizard(BaseWizard, Widget): try: os.unlink(self.path) except FileNotFoundError: pass self.reset_stack() - self.confirm_dialog(message=_('Wallet creation failed'), run_next=self.app.on_wizard_aborted) + self.confirm_dialog(message=_('Wallet creation failed'), run_next=lambda x: self.app.on_wizard_aborted()) def choice_dialog(self, **kwargs): choices = kwargs['choices']