From 115ef54c0c467ec79fba740ac49aa56bb5b2d756 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 2 Nov 2017 12:11:36 +0100 Subject: [PATCH] fix: wallet storage upgrade happening silently even when using QT GUI --- gui/qt/__init__.py | 2 +- lib/daemon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py index ad733a52..31cd94d2 100644 --- a/gui/qt/__init__.py +++ b/gui/qt/__init__.py @@ -192,7 +192,7 @@ class ElectrumGui: d.exec_() return if not wallet: - storage = WalletStorage(path) + storage = WalletStorage(path, manual_upgrades=True) wizard = InstallWizard(self.config, self.app, self.plugins, storage) try: wallet = wizard.run_and_get_wallet() diff --git a/lib/daemon.py b/lib/daemon.py index 1aa3a07d..fbc9c28f 100644 --- a/lib/daemon.py +++ b/lib/daemon.py @@ -220,7 +220,7 @@ class Daemon(DaemonThread): if storage.requires_split(): return if storage.requires_upgrade(): - storage.upgrade() + return if storage.get_action(): return wallet = Wallet(storage)