Merge pull request #302

0b7efa1 Wizard: Prevent user from getting trapped (Jaquee)

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() {

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() {