4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-14 20:36:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Issue 1080] Fixed undefined variable for password rewrite when changing wallet initial block height

Browse Source
This commit is contained in:
Neozaru 2018-01-16 18:00:53 +01:00
parent 3b069ec049
commit 4c9e2c1f1a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.qml
View File

@ -224,7 +224,7 @@ ApplicationWindow {
var wallet_path = walletPath(); var wallet_path = walletPath();
if(isIOS) if(isIOS)
wallet_path = moneroAccountsDir + wallet_path; wallet_path = moneroAccountsDir + wallet_path;
// console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.password); // console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.walletPassword);
console.log("opening wallet at: ", wallet_path, ", testnet: ", persistentSettings.testnet); console.log("opening wallet at: ", wallet_path, ", testnet: ", persistentSettings.testnet);
walletManager.openWalletAsync(wallet_path, walletPassword, walletManager.openWalletAsync(wallet_path, walletPassword,
persistentSettings.testnet); persistentSettings.testnet);

6
pages/Settings.qml
View File

@ -128,7 +128,7 @@ Rectangle {
confirmationDialog.onAcceptedCallback = function() { confirmationDialog.onAcceptedCallback = function() {
walletManager.closeWallet(); walletManager.closeWallet();
walletManager.clearWalletCache(persistentSettings.wallet_path); walletManager.clearWalletCache(persistentSettings.wallet_path);
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password, walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
persistentSettings.testnet); persistentSettings.testnet);
} }
@ -556,7 +556,7 @@ Rectangle {
onClicked: { onClicked: {
currentWallet.walletCreationHeight = restoreHeight.text currentWallet.walletCreationHeight = restoreHeight.text
// Restore height is saved in .keys file. Set password to trigger rewrite. // Restore height is saved in .keys file. Set password to trigger rewrite.
currentWallet.setPassword(appWindow.password) currentWallet.setPassword(appWindow.walletPassword)
restoreHeightRow.visible = false restoreHeightRow.visible = false
// Show confirmation dialog // Show confirmation dialog
@ -573,7 +573,7 @@ Rectangle {
confirmationDialog.onAcceptedCallback = function() { confirmationDialog.onAcceptedCallback = function() {
walletManager.closeWallet(); walletManager.closeWallet();
walletManager.clearWalletCache(persistentSettings.wallet_path); walletManager.clearWalletCache(persistentSettings.wallet_path);
walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.password, walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
persistentSettings.testnet); persistentSettings.testnet);
} }