Merge pull request #3010 from SomberNight/qt_wiz_catch_exc

fix: [QT wallet wizard] catch exceptions: UserCancelled, GoBack
This commit is contained in:
ThomasV 2017-10-19 16:03:01 +02:00 committed by GitHub
commit 76da6916f3
1 changed files with 7 additions and 2 deletions

View File

@ -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