electrum

commit 3127fbd0c2e9527d70ddef9333fe0021f75bd7c0
parent 34c90a257bdb2c586b633becc7fa4759dcd4a315
Author: ThomasV <thomasv@electrum.org>
Date:   Sun,  2 Oct 2016 12:30:57 +0200

we need to check requires_split first, and get_action at the end

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

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/daemon.py b/lib/daemon.py
@@ -187,11 +187,13 @@ class Daemon(DaemonThread):
         storage = WalletStorage(path)
         if not storage.file_exists:
             return
-        if storage.requires_split() or storage.get_action():
+        if storage.requires_split():
             return
         if storage.requires_upgrade():
             self.print_error('upgrading wallet format')
             storage.upgrade()
+        if storage.get_action():
+            return
         wallet = Wallet(storage)
         wallet.start_threads(self.network)
         self.wallets[path] = wallet