forked from len0rd/rockbox
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
This commit is contained in:
parent
370455cc41
commit
f6ba4cbe0d
1 changed files with 4 additions and 3 deletions
|
|
@ -618,7 +618,7 @@ void RbUtilQt::installBootloaderBtn()
|
||||||
|
|
||||||
// create logger
|
// create logger
|
||||||
logger = new ProgressLoggerGui(this);
|
logger = new ProgressLoggerGui(this);
|
||||||
|
logger->show();
|
||||||
installBootloader();
|
installBootloader();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -724,6 +724,7 @@ void RbUtilQt::installBootloader()
|
||||||
// installation.
|
// installation.
|
||||||
m_error = true;
|
m_error = true;
|
||||||
logger->addItem(tr("Bootloader installation aborted"), LOGINFO);
|
logger->addItem(tr("Bootloader installation aborted"), LOGINFO);
|
||||||
|
logger->setFinished();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// open dialog to browse to of file
|
// open dialog to browse to of file
|
||||||
|
|
@ -732,6 +733,7 @@ void RbUtilQt::installBootloader()
|
||||||
tr("Select firmware file"), QDir::homePath());
|
tr("Select firmware file"), QDir::homePath());
|
||||||
if(!QFileInfo(offile).isReadable()) {
|
if(!QFileInfo(offile).isReadable()) {
|
||||||
logger->addItem(tr("Error opening firmware file"), LOGERROR);
|
logger->addItem(tr("Error opening firmware file"), LOGERROR);
|
||||||
|
logger->setFinished();
|
||||||
m_error = true;
|
m_error = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -745,8 +747,7 @@ void RbUtilQt::installBootloader()
|
||||||
connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||||
connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||||
|
|
||||||
// show logger and start install.
|
// start install.
|
||||||
logger->show();
|
|
||||||
if(!backupDestination.isEmpty()) {
|
if(!backupDestination.isEmpty()) {
|
||||||
if(!bl->backup(backupDestination)) {
|
if(!bl->backup(backupDestination)) {
|
||||||
if(QMessageBox::warning(this, tr("Backup error"),
|
if(QMessageBox::warning(this, tr("Backup error"),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue