AaronFiore/electrum
1
0
Fork 0
Code Activity

follow up 4efa6cb24b

Browse Source
This commit is contained in:
ThomasV
2016-04-08 12:49:21 +02:00
parent 43c037cc10
commit caf2f321e0
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/daemon.py
View File

@@ -176,20 +176,18 @@ class Daemon(DaemonThread):
wallet = self.wallets[path] wallet = self.wallets[path]
else: else:
storage = WalletStorage(path) storage = WalletStorage(path)
if get_wizard:
if storage.file_exists: if storage.file_exists:
wallet = Wallet(storage) wallet = Wallet(storage)
action = wallet.get_action() action = wallet.get_action()
else: else:
action = 'new' action = 'new'
if action: if action:
if get_wizard is None:
return None
wizard = get_wizard() wizard = get_wizard()
wallet = wizard.run(self.network, storage) wallet = wizard.run(self.network, storage)
else: else:
wallet.start_threads(self.network) wallet.start_threads(self.network)
else:
wallet = Wallet(storage)
wallet.start_threads(self.network)
if wallet: if wallet:
self.wallets[path] = wallet self.wallets[path] = wallet
return wallet return wallet