diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-02-25 14:36:45 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-02-25 14:36:45 -0600 |
| commit | 0a5e87d00719ee78325a80f87353a7576f88c417 (patch) | |
| tree | dff2f2d75044bb5c2708667ace0848b3ead2f4e2 | |
| parent | a237d16f7d4a9db778bdb9238bb26242c33c33e6 (diff) | |
| parent | 05f0f82bdc345c63bd2482111f05282861d97cfa (diff) | |
| download | monzero-gui-0a5e87d00719ee78325a80f87353a7576f88c417.tar.gz monzero-gui-0a5e87d00719ee78325a80f87353a7576f88c417.tar.xz monzero-gui-0a5e87d00719ee78325a80f87353a7576f88c417.zip | |
Merge pull request #1962
05f0f82 Save wallet password (xmrdsc)
| -rw-r--r-- | wizard/WizardController.qml | 2 | ||||
| -rw-r--r-- | wizard/WizardCreateWallet2.qml | 2 | ||||
| -rw-r--r-- | wizard/WizardRestoreWallet2.qml | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index 87d96f70..bb073b66 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -310,7 +310,7 @@ Rectangle { oshelper.removeTemporaryWallet(wizardController.tmpWalletFilename) // protecting wallet with password - wizardController.m_wallet.setPassword(walletOptionsPassword); + wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword); // Store password in session to be able to use password protected functions (e.g show seed) appWindow.walletPassword = walletOptionsPassword diff --git a/wizard/WizardCreateWallet2.qml b/wizard/WizardCreateWallet2.qml index 92e8f5b1..75f6e63d 100644 --- a/wizard/WizardCreateWallet2.qml +++ b/wizard/WizardCreateWallet2.qml @@ -69,6 +69,8 @@ Rectangle { } } onNextClicked: { + wizardController.walletOptionsPassword = passwordFields.password; + if(appWindow.walletMode === 0 || appWindow.walletMode === 1){ wizardController.fetchRemoteNodes(function(){ wizardStateView.state = "wizardCreateWallet4"; diff --git a/wizard/WizardRestoreWallet2.qml b/wizard/WizardRestoreWallet2.qml index e92c5358..017c1411 100644 --- a/wizard/WizardRestoreWallet2.qml +++ b/wizard/WizardRestoreWallet2.qml @@ -68,6 +68,8 @@ Rectangle { wizardStateView.state = "wizardRestoreWallet1"; } onNextClicked: { + wizardController.walletOptionsPassword = passwordFields.password; + if(appWindow.walletMode === 0 || appWindow.walletMode === 1){ wizardController.fetchRemoteNodes(function(){ wizardStateView.state = "wizardRestoreWallet4"; |