len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-11 06:05:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix automated install not aborting when bootloader installation was canceled during prerequisite confirmation. Add info to the log window when cancelled or skipped.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20147 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-02-28 23:11:26 +00:00
parent f437d78f0c
commit 10c1fef096
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -462,8 +462,10 @@ bool RbUtilQt::smallInstallInner()
m_error = false; m_error = false;
m_installed = false; m_installed = false;
m_auto = true; m_auto = true;
if(!installBootloaderAuto()) if(!installBootloaderAuto()) {
logger->abort();
return true; return true;
}
else else
{ {
// wait for boot loader installation finished // wait for boot loader installation finished
@ -665,6 +667,7 @@ void RbUtilQt::installBootloader()
if(m_auto) { if(m_auto) {
// keep logger open for auto installs. // keep logger open for auto installs.
// don't consider abort as error in auto-mode. // don't consider abort as error in auto-mode.
logger->addItem(tr("Bootloader installation skipped"), LOGINFO);
installBootloaderPost(false); installBootloaderPost(false);
} }
else { else {
@ -714,7 +717,10 @@ void RbUtilQt::installBootloader()
"file."), "file."),
QMessageBox::Ok | QMessageBox::Abort); QMessageBox::Ok | QMessageBox::Abort);
if(ret != QMessageBox::Ok) { if(ret != QMessageBox::Ok) {
// consider aborting an error to close window / abort automatic
// installation.
m_error = true; m_error = true;
logger->addItem(tr("Bootloader installation aborted"), LOGINFO);
return; return;
} }
// open dialog to browse to hex file // open dialog to browse to hex file