monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1082

Browse source 
4c9e2c1 [Issue 1080] Fixed undefined variable for password rewrite when changing wallet initial block height
This commit is contained in:
luigi1111 2018-03-13 16:27:27 -04:00
commit 39db876fee
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
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();
if(isIOS)
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);
walletManager.openWalletAsync(wallet_path, walletPassword,
persistentSettings.testnet);

6
pages/Settings.qml
View file

@ -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);
}