twizard: fix decryption of hw wallet files - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 7458461f130933ba9b38d7258f05dec3b7832d1c
DIR parent b076f5294f919fb7ae1c04e64feadcb58ce8e6db
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sun, 3 Mar 2019 17:33:13 +0100
wizard: fix decryption of hw wallet files
see #5174
Diffstat:
M electrum/gui/qt/installwizard.py | 2 +-
M electrum/storage.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum/gui/qt/installwizard.py b/electrum/gui/qt/installwizard.py
t@@ -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'),
DIR diff --git a/electrum/storage.py b/electrum/storage.py
t@@ -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."""