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

2016-10-02 12:30:57 +02:00 · 2016-10-02 12:30:57 +02:00 · 3127fbd0c2
parent 34c90a257b
commit 3127fbd0c2
1 changed files with 3 additions and 1 deletions
--- 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