electrum

commit 5b96d5166e31984a0ea20e94f326663e7a11ab90
parent 052d8b236edd1fa151e71ef2ef8f88c7a0e7fbe5
Author: ThomasV <thomasv@electrum.org>
Date:   Wed, 28 Oct 2015 10:46:01 +0100

fix restore messages

Diffstat:
M
electrum
 | 
2
+-
M
lib/commands.py
 | 
10
+++++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/electrum b/electrum
@@ -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)
diff --git a/lib/commands.py b/lib/commands.py
@@ -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')