AaronFiore/electrum
1
0
Fork 0
Code Activity

Do not exit when the New Wallet dialog is canceled

Browse Source
This commit is contained in:
ThomasV
2015-02-21 16:25:06 +01:00
parent b3364b87d1
commit 2a608280f4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/qt/main_window.py
View File

@@ -276,8 +276,6 @@ class ElectrumWindow(QMainWindow):
if action is not None: if action is not None:
if not self.question(_("This file contains an incompletely created wallet.\nDo you want to complete its creation now?")): if not self.question(_("This file contains an incompletely created wallet.\nDo you want to complete its creation now?")):
return return
# close current wallet
self.close_wallet()
self.hide() self.hide()
# run wizard # run wizard
if action is not None: if action is not None:
@@ -290,9 +288,12 @@ class ElectrumWindow(QMainWindow):
QMessageBox.information(None, _('Error'), str(e), _('OK')) QMessageBox.information(None, _('Error'), str(e), _('OK'))
return return
if not wallet: if not wallet:
self.show()
return return
else: else:
wallet.start_threads(self.network) wallet.start_threads(self.network)
# close current wallet
self.close_wallet()
# load new wallet in gui # load new wallet in gui
self.load_wallet(wallet) self.load_wallet(wallet)
self.show() self.show()
@@ -341,11 +342,11 @@ class ElectrumWindow(QMainWindow):
return return
self.hide() self.hide()
if self.wallet:
self.close_wallet()
wizard = installwizard.InstallWizard(self.config, self.network, storage) wizard = installwizard.InstallWizard(self.config, self.network, storage)
wallet = wizard.run('new') wallet = wizard.run('new')
if wallet: if wallet:
if self.wallet:
self.close_wallet()
self.load_wallet(wallet) self.load_wallet(wallet)
self.show() self.show()