tDo not exit when the New Wallet dialog is canceled - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2a608280f4e22ff9b24ca90fd87cbe4b013da77a
DIR parent b3364b87d1fa08178197f1f8f7ece445bc0c3719
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 21 Feb 2015 16:25:06 +0100
Do not exit when the New Wallet dialog is canceled
Diffstat:
M gui/qt/main_window.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -276,8 +276,6 @@ class ElectrumWindow(QMainWindow):
if action is not None:
if not self.question(_("This file contains an incompletely created wallet.\nDo you want to complete its creation now?")):
return
- # close current wallet
- self.close_wallet()
self.hide()
# run wizard
if action is not None:
t@@ -290,9 +288,12 @@ class ElectrumWindow(QMainWindow):
QMessageBox.information(None, _('Error'), str(e), _('OK'))
return
if not wallet:
+ self.show()
return
else:
wallet.start_threads(self.network)
+ # close current wallet
+ self.close_wallet()
# load new wallet in gui
self.load_wallet(wallet)
self.show()
t@@ -341,11 +342,11 @@ class ElectrumWindow(QMainWindow):
return
self.hide()
- if self.wallet:
- self.close_wallet()
wizard = installwizard.InstallWizard(self.config, self.network, storage)
wallet = wizard.run('new')
if wallet:
+ if self.wallet:
+ self.close_wallet()
self.load_wallet(wallet)
self.show()