From 588b38b3a0b0be9c58c11335694fa50da0f97a08 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sat, 3 Jul 2021 00:22:20 +0200 Subject: [PATCH] Wizard: handle 0 restore height --- src/wizard/PageSetRestoreHeight.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/wizard/PageSetRestoreHeight.cpp b/src/wizard/PageSetRestoreHeight.cpp index 7bd13fa..ca9955a 100644 --- a/src/wizard/PageSetRestoreHeight.cpp +++ b/src/wizard/PageSetRestoreHeight.cpp @@ -29,9 +29,6 @@ PageSetRestoreHeight::PageSetRestoreHeight(WizardFields *fields, QWidget *parent ui->warningIcon->setPixmap(pixmap2.scaledToWidth(32, Qt::SmoothTransformation)); ui->infoIcon->setPixmap(pixmap2.scaledToWidth(32, Qt::SmoothTransformation)); - ui->frame_scanWarning->hide(); - ui->frame_walletAgeWarning->hide(); - connect(ui->line_creationDate, &QLineEdit::textEdited, [this]{ this->onCreationDateEdited(); this->completeChanged(); @@ -46,6 +43,8 @@ void PageSetRestoreHeight::initializePage() { this->setTitle("Restore height"); ui->line_creationDate->setText(""); ui->line_restoreHeight->setText(""); + ui->frame_scanWarning->hide(); + ui->frame_walletAgeWarning->hide(); } void PageSetRestoreHeight::onCreationDateEdited() { @@ -71,10 +70,7 @@ void PageSetRestoreHeight::onCreationDateEdited() { void PageSetRestoreHeight::onRestoreHeightEdited() { int restoreHeight = ui->line_restoreHeight->text().toInt(); if (restoreHeight == 0) { - ui->frame_walletAgeWarning->hide(); - ui->frame_scanWarning->hide(); - ui->line_creationDate->setText(""); - return; + restoreHeight = 1; } QDateTime date = appData()->restoreHeights[constants::networkType]->heightToDate(restoreHeight); @@ -96,7 +92,7 @@ void PageSetRestoreHeight::showWalletAgeWarning(const QDateTime &date) { } bool PageSetRestoreHeight::validatePage() { - m_fields->restoreHeight = ui->line_restoreHeight->text().toInt(); + m_fields->restoreHeight = std::max(1, ui->line_restoreHeight->text().toInt()); return true; }