load_wallet: return from loop if the error is not invalid password

This commit is contained in:
ThomasV 2017-03-01 20:10:47 +01:00
parent ec5e33149f
commit 6581cd93bb
1 changed files with 6 additions and 2 deletions

View File

@ -43,7 +43,7 @@ from electrum.paymentrequest import InvoiceStore
from electrum.contacts import Contacts from electrum.contacts import Contacts
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 from electrum.util import DebugMem, UserCancelled, InvalidPassword
from electrum.wallet import Abstract_Wallet from electrum.wallet import Abstract_Wallet
from installwizard import InstallWizard, GoBack from installwizard import InstallWizard, GoBack
@ -176,9 +176,13 @@ class ElectrumGui:
break break
except UserCancelled: except UserCancelled:
return return
except BaseException as e: except InvalidPassword as e:
QMessageBox.information(None, _('Error'), str(e), _('OK')) QMessageBox.information(None, _('Error'), str(e), _('OK'))
continue continue
except BaseException as e:
traceback.print_exc(file=sys.stdout)
QMessageBox.information(None, _('Error'), str(e), _('OK'))
return
w = self.create_window_for_wallet(wallet) w = self.create_window_for_wallet(wallet)
if uri: if uri:
w.pay_to_URI(uri) w.pay_to_URI(uri)