forked from Public/monero-gui
Merge pull request #1082
4c9e2c1 [Issue 1080] Fixed undefined variable for password rewrite when changing wallet initial block height
This commit is contained in:
@@ -128,7 +128,7 @@ Rectangle {
|
||||
confirmationDialog.onAcceptedCallback = function() {
|
||||
walletManager.closeWallet();
|
||||
walletManager.clearWalletCache(persistentSettings.wallet_path);
|
||||
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password,
|
||||
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
|
||||
persistentSettings.testnet);
|
||||
}
|
||||
|
||||
@@ -580,7 +580,7 @@ Rectangle {
|
||||
onClicked: {
|
||||
currentWallet.walletCreationHeight = restoreHeight.text
|
||||
// Restore height is saved in .keys file. Set password to trigger rewrite.
|
||||
currentWallet.setPassword(appWindow.password)
|
||||
currentWallet.setPassword(appWindow.walletPassword)
|
||||
restoreHeightRow.visible = false
|
||||
|
||||
// Show confirmation dialog
|
||||
@@ -597,7 +597,7 @@ Rectangle {
|
||||
confirmationDialog.onAcceptedCallback = function() {
|
||||
walletManager.closeWallet();
|
||||
walletManager.clearWalletCache(persistentSettings.wallet_path);
|
||||
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password,
|
||||
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
|
||||
persistentSettings.testnet);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user