twizard: change order - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2c1bf7ca9506fe99c69c4e32a18e0174410127c6
DIR parent 4e9408d9174f06ef790e755d6590fc38aa24035c
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 21 Aug 2014 10:27:30 +0200
wizard: change order
Diffstat:
M gui/qt/installwizard.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -470,12 +470,7 @@ class InstallWizard(QDialog):
text = self.enter_seed_dialog(MSG_ENTER_ANYTHING, None)
if not text:
return
- if Wallet.is_seed(text):
- password = self.password_dialog()
- wallet = Wallet.from_seed(text, self.storage)
- wallet.add_seed(text, password)
- wallet.create_main_account(password)
- elif Wallet.is_xprv(text):
+ if Wallet.is_xprv(text):
password = self.password_dialog()
wallet = Wallet.from_xprv(text, password, self.storage)
elif Wallet.is_old_mpk(text):
t@@ -486,6 +481,11 @@ class InstallWizard(QDialog):
wallet = Wallet.from_address(text, self.storage)
elif Wallet.is_private_key(text):
wallet = Wallet.from_private_key(text, self.storage)
+ elif Wallet.is_seed(text):
+ password = self.password_dialog()
+ wallet = Wallet.from_seed(text, self.storage)
+ wallet.add_seed(text, password)
+ wallet.create_main_account(password)
else:
raise BaseException('unknown wallet type')