From 0b7efa19ef4950a8e72e410b7e6737f44a7935e6 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 17 Dec 2016 15:38:43 +0100 Subject: [PATCH] Wizard: Prevent user from getting trapped --- wizard/WizardMain.qml | 6 ++---- wizard/WizardRecoveryWallet.qml | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index eabbec8e..dc84a4a4 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -92,8 +92,8 @@ Rectangle { var nextButtonVisible = pages[currentPage] !== optionsPage; nextButton.visible = nextButtonVisible; - if (next && typeof pages[currentPage].onPageOpened !== 'undefined') { - pages[currentPage].onPageOpened(settings) + if (typeof pages[currentPage].onPageOpened !== 'undefined') { + pages[currentPage].onPageOpened(settings,next) } @@ -113,8 +113,6 @@ Rectangle { createWalletPage.createWallet(settings) wizard.nextButton.visible = true createWalletPage.onPageOpened(settings); - - } function openRecoveryWalletPage() { diff --git a/wizard/WizardRecoveryWallet.qml b/wizard/WizardRecoveryWallet.qml index 2c75225e..e93eddce 100644 --- a/wizard/WizardRecoveryWallet.qml +++ b/wizard/WizardRecoveryWallet.qml @@ -44,12 +44,12 @@ Item { function onWizardRestarted() { // reset account name field uiItem.accountNameText = defaultAccountName + // Empty seedText + uiItem.wordsTextItem.memoText = ""; } function onPageOpened(settingsObject) { - checkNextButton(); - // Empty seedText when restoring multiple times in one session - uiItem.wordsTextItem.memoText = ""; + checkNextButton(); } function checkNextButton() {