we need to check requires_split first, and get_action at the end
This commit is contained in:
parent
34c90a257b
commit
3127fbd0c2
|
@ -187,11 +187,13 @@ class Daemon(DaemonThread):
|
||||||
storage = WalletStorage(path)
|
storage = WalletStorage(path)
|
||||||
if not storage.file_exists:
|
if not storage.file_exists:
|
||||||
return
|
return
|
||||||
if storage.requires_split() or storage.get_action():
|
if storage.requires_split():
|
||||||
return
|
return
|
||||||
if storage.requires_upgrade():
|
if storage.requires_upgrade():
|
||||||
self.print_error('upgrading wallet format')
|
self.print_error('upgrading wallet format')
|
||||||
storage.upgrade()
|
storage.upgrade()
|
||||||
|
if storage.get_action():
|
||||||
|
return
|
||||||
wallet = Wallet(storage)
|
wallet = Wallet(storage)
|
||||||
wallet.start_threads(self.network)
|
wallet.start_threads(self.network)
|
||||||
self.wallets[path] = wallet
|
self.wallets[path] = wallet
|
||||||
|
|
Loading…
Reference in New Issue