check requires_split before upgrade

2016-10-02 12:15:51 +02:00 · 2016-10-02 12:15:51 +02:00 · 5541c1bec6
parent 4788a10a8b
commit 5541c1bec6
2 changed files with 4 additions and 4 deletions
--- a/lib/daemon.py
+++ b/lib/daemon.py
@ -187,8 +187,11 @@ class Daemon(DaemonThread):
        storage = WalletStorage(path)
        if not storage.file_exists:
            return
-        if storage.requires_split() or storage.requires_upgrade() or storage.get_action():
+        if storage.requires_split() or storage.get_action():
            return
+        if self.requires_upgrade():
+            self.print_error('upgrading wallet format')
+            self.upgrade()
        wallet = Wallet(storage)
        wallet.start_threads(self.network)
        self.wallets[path] = wallet
--- a/lib/storage.py
+++ b/lib/storage.py
@ -60,9 +60,6 @@ class WalletStorage(PrintError):
        self.print_error("wallet path", self.path)
        if self.path:
            self.read(self.path)
-        if self.requires_upgrade():
-            self.print_error('upgrading wallet format')
-            self.upgrade()
        # check here if I need to load a plugin
        t = self.get('wallet_type')
        l = plugin_loaders.get(t)