1
0
Fork 0
forked from len0rd/rockbox

If bootloader installation failed abort logger so the user needs to confirm the error only once.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14129 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-08-01 22:21:57 +00:00
parent c5b5220595
commit 0b08f41ae9
2 changed files with 10 additions and 0 deletions

View file

@ -30,6 +30,7 @@ void BootloaderInstaller::install(ProgressloggerInterface* dp)
m_dp = dp; m_dp = dp;
m_install = true; m_install = true;
m_dp->addItem(tr("Starting bootloader installation"),LOGINFO); m_dp->addItem(tr("Starting bootloader installation"),LOGINFO);
connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool)));
if(m_bootloadermethod == "gigabeatf") if(m_bootloadermethod == "gigabeatf")
{ {
@ -82,6 +83,7 @@ void BootloaderInstaller::uninstall(ProgressloggerInterface* dp)
m_dp = dp; m_dp = dp;
m_install = false; m_install = false;
m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO); m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO);
connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool)));
if(m_bootloadermethod == "gigabeatf") if(m_bootloadermethod == "gigabeatf")
{ {
@ -171,6 +173,13 @@ void BootloaderInstaller::updateDataReadProgress(int read, int total)
} }
void BootloaderInstaller::installEnded(bool error)
{
(void) error;
m_dp->abort();
}
/************************************************** /**************************************************
*** gigabeat secific code *** gigabeat secific code
***************************************************/ ***************************************************/

View file

@ -65,6 +65,7 @@ private slots:
void updateDataReadProgress(int, int); void updateDataReadProgress(int, int);
void downloadDone(bool); void downloadDone(bool);
void downloadRequestFinished(int, bool); void downloadRequestFinished(int, bool);
void installEnded(bool);
// gigabeat specific routines // gigabeat specific routines
void gigabeatPrepare(); void gigabeatPrepare();