From 7458461f130933ba9b38d7258f05dec3b7832d1c Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sun, 3 Mar 2019 17:33:13 +0100 Subject: [PATCH] wizard: fix decryption of hw wallet files see #5174 --- electrum/gui/qt/installwizard.py | 2 +- electrum/storage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qt/installwizard.py b/electrum/gui/qt/installwizard.py index 95f596f96..88307891c 100644 --- a/electrum/gui/qt/installwizard.py +++ b/electrum/gui/qt/installwizard.py @@ -270,7 +270,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard): return elif self.temp_storage.is_encrypted_with_hw_device(): try: - self.run('choose_hw_device', HWD_SETUP_DECRYPT_WALLET, self.temp_storage) + self.run('choose_hw_device', HWD_SETUP_DECRYPT_WALLET, storage=self.temp_storage) except InvalidPassword as e: QMessageBox.information( None, _('Error'), diff --git a/electrum/storage.py b/electrum/storage.py index 5d2ef1c49..4b63219de 100644 --- a/electrum/storage.py +++ b/electrum/storage.py @@ -119,7 +119,7 @@ class WalletStorage(PrintError): if encryption is disabled completely (self.is_encrypted() == False), or if encryption is enabled but the contents have already been decrypted. """ - return bool(self.data) + return bool(self.db.data) def is_encrypted(self): """Return if storage encryption is currently enabled."""