From 4c9e2c1f1a82408a95d76da3f1cad50761d820f8 Mon Sep 17 00:00:00 2001
From: Neozaru <neozaru@mailoo.org>
Date: Tue, 16 Jan 2018 18:00:53 +0100
Subject: [PATCH] [Issue 1080] Fixed undefined variable for password rewrite
 when changing wallet initial block height

---
 main.qml           | 2 +-
 pages/Settings.qml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.qml b/main.qml
index 387d1b5d..59230697 100644
--- a/main.qml
+++ b/main.qml
@@ -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);
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 18f431d4..ba1950a7 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -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);
                     }
 
@@ -556,7 +556,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
@@ -573,7 +573,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);
                     }