aboutsummaryrefslogtreecommitdiff
path: root/wizard/WizardController.qml
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-12-19 19:30:32 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-12-19 19:30:32 -0500
commit05a0d21f4c72122af2b7c52e01a7bd5679d4bb91 (patch)
tree9f8751aaf710f0531a04cc9cb4f4b3d82dabb2e0 /wizard/WizardController.qml
parentd0c2740a519e29e9e3e31b0f2e19e6a41ba45dc1 (diff)
parentcc86795fa34635dd49caeaf83a6b8535820e4ef3 (diff)
downloadmonzero-gui-05a0d21f4c72122af2b7c52e01a7bd5679d4bb91.tar.gz
monzero-gui-05a0d21f4c72122af2b7c52e01a7bd5679d4bb91.tar.xz
monzero-gui-05a0d21f4c72122af2b7c52e01a7bd5679d4bb91.zip
Merge pull request #2590
cc86795 WizardController: always close and re-open newly created wallet (xiphon)
Diffstat (limited to 'wizard/WizardController.qml')
-rw-r--r--wizard/WizardController.qml18
1 files changed, 2 insertions, 16 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 235d0f1f..86364f72 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -375,8 +375,7 @@ Rectangle {
// protecting wallet with password
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
+ restart();
// save to persistent settings
persistentSettings.language = wizardController.language_language
@@ -540,20 +539,7 @@ Rectangle {
if(isIOS)
persistentSettings.wallet_path = persistentSettings.wallet_path.replace(moneroAccountsDir, "");
- console.log(moneroAccountsDir);
- console.log(fn);
- console.log(persistentSettings.wallet_path);
-
- passwordDialog.onAcceptedCallback = function() {
- walletPassword = passwordDialog.password;
- appWindow.initialize();
- }
- passwordDialog.onRejectedCallback = function() {
- console.log("Canceled");
- appWindow.viewState = "wizard";
- }
-
- passwordDialog.open(appWindow.usefulName(appWindow.walletPath()));
+ appWindow.openWallet();
}
Component.onCompleted: {