fix
This commit is contained in:
parent
30b67779cb
commit
892aabc7ae
|
@ -425,6 +425,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
msg = 'Your wallet is encrypted. Use this dialog to change the password.\n To disable wallet encryption, enter an empty new password.' if self.wallet.use_encryption else 'Your wallet keys are not encrypted'
|
msg = 'Your wallet is encrypted. Use this dialog to change the password.\n To disable wallet encryption, enter an empty new password.' if self.wallet.use_encryption else 'Your wallet keys are not encrypted'
|
||||||
grid.addWidget(QLabel(msg), 0, 0, 1, 2)
|
grid.addWidget(QLabel(msg), 0, 0, 1, 2)
|
||||||
|
|
||||||
|
if self.wallet.use_encryption:
|
||||||
grid.addWidget(QLabel('Password'), 1, 0)
|
grid.addWidget(QLabel('Password'), 1, 0)
|
||||||
grid.addWidget(pw, 1, 1)
|
grid.addWidget(pw, 1, 1)
|
||||||
|
|
||||||
|
@ -446,8 +447,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
if not d.exec_(): return
|
if not d.exec_(): return
|
||||||
|
|
||||||
password = str(pw.text())
|
password = str(pw.text()) if self.wallet.use_encryption else None
|
||||||
print password
|
|
||||||
new_password = str(new_pw.text())
|
new_password = str(new_pw.text())
|
||||||
new_password2 = str(conf_pw.text())
|
new_password2 = str(conf_pw.text())
|
||||||
|
|
||||||
|
|
|
@ -767,5 +767,5 @@ class Wallet:
|
||||||
a = self.imported_keys[k]
|
a = self.imported_keys[k]
|
||||||
b = self.pw_decode(a, password)
|
b = self.pw_decode(a, password)
|
||||||
c = self.pw_encode(b, new_password)
|
c = self.pw_encode(b, new_password)
|
||||||
self.wallet.imported_keys[k] = c
|
self.imported_keys[k] = c
|
||||||
self.wallet.save()
|
self.save()
|
||||||
|
|
Loading…
Reference in New Issue