electrum

commit 76da6916f3cef08f0e2ff7fb22b4a3c76f8dee5c
parent 0497561e56bf793fb118e610bae0705058865720
Author: ThomasV <thomasv@electrum.org>
Date:   Thu, 19 Oct 2017 16:03:01 +0200

Merge pull request #3010 from SomberNight/qt_wiz_catch_exc

fix: [QT wallet wizard] catch exceptions: UserCancelled, GoBack
Diffstat:
M
gui/qt/__init__.py
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
@@ -42,7 +42,7 @@ from electrum.plugins import run_hook
 from electrum import SimpleConfig, Wallet, WalletStorage
 from electrum.synchronizer import Synchronizer
 from electrum.verifier import SPV
-from electrum.util import DebugMem, UserCancelled, InvalidPassword
+from electrum.util import DebugMem, UserCancelled, InvalidPassword, print_error
 from electrum.wallet import Abstract_Wallet
 
 from .installwizard import InstallWizard, GoBack
@@ -194,7 +194,12 @@ class ElectrumGui:
             if not wallet:
                 storage = WalletStorage(path)
                 wizard = InstallWizard(self.config, self.app, self.plugins, storage)
-                wallet = wizard.run_and_get_wallet()
+                try:
+                    wallet = wizard.run_and_get_wallet()
+                except UserCancelled:
+                    pass
+                except GoBack as e:
+                    print_error('[start_new_window] Exception caught (GoBack)', e)
                 wizard.terminate()
                 if not wallet:
                     return