AaronFiore/electrum
1
0
Fork 0
Code Activity

Qt change_password_dialog: fix deadlock in hww case if device unplugged

Browse Source 
fixes https://github.com/spesmilo/electrum/pull/7819
This commit is contained in:
SomberNight
2022-05-20 20:07:55 +02:00
parent a0b7782e6d
commit 8ed52d4225
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electrum/gui/qt/main_window.py
View File

@@ -2562,25 +2562,27 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
if not ok:
return
try:
hw_dev_pw = self.wallet.keystore.get_password_for_storage_encryption()
except UserCancelled:
return
except BaseException as e:
self.logger.exception('')
self.show_error(repr(e))
return
old_password = hw_dev_pw if self.wallet.has_password() else None
new_password = hw_dev_pw if encrypt_file else None
def on_password(hw_dev_pw):
old_password = hw_dev_pw if self.wallet.has_password() else None
new_password = hw_dev_pw if encrypt_file else None
self._update_wallet_password(
old_password=old_password, new_password=new_password, encrypt_storage=encrypt_file)
self.thread.add(
self.wallet.keystore.get_password_for_storage_encryption,
on_success=on_password)
else:
from .password_dialog import ChangePasswordDialogForSW
d = ChangePasswordDialogForSW(self, self.wallet)
ok, old_password, new_password, encrypt_file = d.run()
if not ok:
return
self._update_wallet_password(
old_password=old_password, new_password=new_password, encrypt_storage=encrypt_file)
if not ok:
return
def _update_wallet_password(self, *, old_password, new_password, encrypt_storage: bool):
try:
self.wallet.update_password(old_password, new_password, encrypt_storage=encrypt_file)
self.wallet.update_password(old_password, new_password, encrypt_storage=encrypt_storage)
except InvalidPassword as e:
self.show_error(str(e))
return