diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2009-05-09 18:49:49 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2009-05-09 18:49:49 +0000 |
commit | f6ba4cbe0d23b89df33fafbb87379cf6d6abb4c9 (patch) | |
tree | 86feca90bba5ca0a41a2a82b81f261145f3ae3c4 | |
parent | 370455cc4159c2a780bb4c917b42490f6512f7df (diff) | |
download | rockbox-f6ba4cbe0d23b89df33fafbb87379cf6d6abb4c9.tar.gz rockbox-f6ba4cbe0d23b89df33fafbb87379cf6d6abb4c9.zip |
rbutil: show logger windows earlier in bootloader install, to catch all errors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20894 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 3a594ef0ad..7c52f1f7cf 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -618,7 +618,7 @@ void RbUtilQt::installBootloaderBtn() | |||
618 | 618 | ||
619 | // create logger | 619 | // create logger |
620 | logger = new ProgressLoggerGui(this); | 620 | logger = new ProgressLoggerGui(this); |
621 | 621 | logger->show(); | |
622 | installBootloader(); | 622 | installBootloader(); |
623 | } | 623 | } |
624 | 624 | ||
@@ -724,6 +724,7 @@ void RbUtilQt::installBootloader() | |||
724 | // installation. | 724 | // installation. |
725 | m_error = true; | 725 | m_error = true; |
726 | logger->addItem(tr("Bootloader installation aborted"), LOGINFO); | 726 | logger->addItem(tr("Bootloader installation aborted"), LOGINFO); |
727 | logger->setFinished(); | ||
727 | return; | 728 | return; |
728 | } | 729 | } |
729 | // open dialog to browse to of file | 730 | // open dialog to browse to of file |
@@ -732,6 +733,7 @@ void RbUtilQt::installBootloader() | |||
732 | tr("Select firmware file"), QDir::homePath()); | 733 | tr("Select firmware file"), QDir::homePath()); |
733 | if(!QFileInfo(offile).isReadable()) { | 734 | if(!QFileInfo(offile).isReadable()) { |
734 | logger->addItem(tr("Error opening firmware file"), LOGERROR); | 735 | logger->addItem(tr("Error opening firmware file"), LOGERROR); |
736 | logger->setFinished(); | ||
735 | m_error = true; | 737 | m_error = true; |
736 | return; | 738 | return; |
737 | } | 739 | } |
@@ -745,8 +747,7 @@ void RbUtilQt::installBootloader() | |||
745 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 747 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |
746 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | 748 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); |
747 | 749 | ||
748 | // show logger and start install. | 750 | // start install. |
749 | logger->show(); | ||
750 | if(!backupDestination.isEmpty()) { | 751 | if(!backupDestination.isEmpty()) { |
751 | if(!bl->backup(backupDestination)) { | 752 | if(!bl->backup(backupDestination)) { |
752 | if(QMessageBox::warning(this, tr("Backup error"), | 753 | if(QMessageBox::warning(this, tr("Backup error"), |