AaronFiore/electrum
1
0
Fork 0
Code Activity

qt wizard: catch wallet/bitcoin exceptions (regression)

Browse Source 
fix #5342
This commit is contained in:
SomberNight
2019-05-13 22:56:38 +02:00
parent d2a80f15a1
commit 4db1535bce
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/gui/qt/__init__.py
View File

@@ -233,7 +233,12 @@ class ElectrumGui(Logger):
if not app_is_starting: if not app_is_starting:
return return
if not wallet: if not wallet:
wallet = self._start_wizard_to_select_or_create_wallet(path) try:
wallet = self._start_wizard_to_select_or_create_wallet(path)
except (WalletFileException, BitcoinException) as e:
self.logger.exception('')
QMessageBox.warning(None, _('Error'),
_('Cannot load wallet') + ' (2):\n' + str(e))
if not wallet: if not wallet:
return return
# create or raise window # create or raise window
@@ -275,11 +280,6 @@ class ElectrumGui(Logger):
return return
except WalletAlreadyOpenInMemory as e: except WalletAlreadyOpenInMemory as e:
return e.wallet return e.wallet
except (WalletFileException, BitcoinException) as e:
self.logger.exception('')
QMessageBox.warning(None, _('Error'),
_('Cannot load wallet') + ' (2):\n' + str(e))
return
finally: finally:
wizard.terminate() wizard.terminate()
# return if wallet creation is not complete # return if wallet creation is not complete