monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-03-26 00:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #302

Browse source 
0b7efa1 Wizard: Prevent user from getting trapped (Jaquee)
This commit is contained in:
Riccardo Spagni 2016-12-20 22:54:53 +02:00
commit def02f6332
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wizard/WizardMain.qml
View file

@ -92,8 +92,8 @@ Rectangle {
var nextButtonVisible = pages[currentPage] !== optionsPage; var nextButtonVisible = pages[currentPage] !== optionsPage;
nextButton.visible = nextButtonVisible; nextButton.visible = nextButtonVisible;
if (next && typeof pages[currentPage].onPageOpened !== 'undefined') { if (typeof pages[currentPage].onPageOpened !== 'undefined') {
pages[currentPage].onPageOpened(settings) pages[currentPage].onPageOpened(settings,next)
} }
@ -113,8 +113,6 @@ Rectangle {
createWalletPage.createWallet(settings) createWalletPage.createWallet(settings)
wizard.nextButton.visible = true wizard.nextButton.visible = true
createWalletPage.onPageOpened(settings); createWalletPage.onPageOpened(settings);
} }
function openRecoveryWalletPage() { function openRecoveryWalletPage() {

6
wizard/WizardRecoveryWallet.qml
View file

@ -44,12 +44,12 @@ Item {
function onWizardRestarted() { function onWizardRestarted() {
// reset account name field // reset account name field
uiItem.accountNameText = defaultAccountName uiItem.accountNameText = defaultAccountName
// Empty seedText
uiItem.wordsTextItem.memoText = "";
} }
function onPageOpened(settingsObject) { function onPageOpened(settingsObject) {
checkNextButton(); checkNextButton();
// Empty seedText when restoring multiple times in one session
uiItem.wordsTextItem.memoText = "";
} }
function checkNextButton() { function checkNextButton() {