electrum

commit caf2f321e0df1db52f137122da808ba314f9c183
parent 43c037cc10e1f66347ff061a68eaed9fcb3c8c02
Author: ThomasV <thomasv@electrum.org>
Date:   Fri,  8 Apr 2016 12:49:21 +0200

follow up 4efa6cb24bde25611c0ff581aa89395dc32328db

Diffstat:
M
lib/daemon.py
 | 
22
++++++++++------------

1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/lib/daemon.py b/lib/daemon.py
@@ -176,19 +176,17 @@ class Daemon(DaemonThread):
             wallet = self.wallets[path]
         else:
             storage = WalletStorage(path)
-            if get_wizard:
-                if storage.file_exists:
-                    wallet = Wallet(storage)
-                    action = wallet.get_action()
-                else:
-                    action = 'new'
-                if action:
-                    wizard = get_wizard()
-                    wallet = wizard.run(self.network, storage)
-                else:
-                    wallet.start_threads(self.network)
-            else:
+            if storage.file_exists:
                 wallet = Wallet(storage)
+                action = wallet.get_action()
+            else:
+                action = 'new'
+            if action:
+                if get_wizard is None:
+                    return None
+                wizard = get_wizard()
+                wallet = wizard.run(self.network, storage)
+            else:
                 wallet.start_threads(self.network)
             if wallet:
                 self.wallets[path] = wallet