fix restore messages

This commit is contained in:
ThomasV 2015-10-28 10:46:01 +01:00
parent 052d8b236e
commit 5b96d5166e
2 changed files with 6 additions and 6 deletions

View File

@ -233,7 +233,7 @@ def run_command(config, network, password):
# create wallet instance
wallet = Wallet(storage) if cmd.requires_wallet else None
# start threads
if network:
if wallet and network:
wallet.start_threads(network)
# arguments passed to function
args = map(lambda x: config.get(x), cmd.params)

View File

@ -109,11 +109,11 @@ class Commands:
public key, a master private key, a list of bitcoin addresses
or bitcoin private keys. If you want to be prompted for your
seed, type '?' or ':' (concealed) """
self.wallet.restore(lambda x: print_msg(x))
#self.wallet.synchronize()
msg = "Recovery successful" if self.wallet.is_found() else "Warning: Found no history for this wallet"
if not self.network:
msg += "\nWarning: This wallet was restored offline. It may contain more addresses than displayed."
self.wallet.restore(lambda x: x)
if self.network:
msg = "Recovery successful" if self.wallet.is_found() else "Found no history for this wallet"
else:
msg = "This wallet was restored offline. It may contain more addresses than displayed."
return msg
@command('w')