AaronFiore/electrum
1
0
Fork 0
Code Activity

fix: [QT wallet wizard] catch exceptions: UserCancelled, GoBack

Browse Source
This commit is contained in:
SomberNight
2017-10-09 02:16:04 +02:00
parent 5480b7dff5
commit d48ecc990a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/qt/__init__.py
View File

@@ -42,7 +42,7 @@ from electrum.plugins import run_hook
from electrum import SimpleConfig, Wallet, WalletStorage from electrum import SimpleConfig, Wallet, WalletStorage
from electrum.synchronizer import Synchronizer from electrum.synchronizer import Synchronizer
from electrum.verifier import SPV 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 electrum.wallet import Abstract_Wallet
from .installwizard import InstallWizard, GoBack from .installwizard import InstallWizard, GoBack
@@ -191,7 +191,12 @@ class ElectrumGui:
if not wallet: if not wallet:
storage = WalletStorage(path) storage = WalletStorage(path)
wizard = InstallWizard(self.config, self.app, self.plugins, storage) 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() wizard.terminate()
if not wallet: if not wallet:
return return