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

2 files changed, 10 insertions, 0 deletions

diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp
index e6dc302281..3a75304d86 100644
--- a/rbutil/rbutilqt/installbootloader.cpp
+++ b/rbutil/rbutilqt/installbootloader.cpp
@@ -30,6 +30,7 @@ void BootloaderInstaller::install(ProgressloggerInterface* dp)
     m_dp = dp;
     m_install = true;
     m_dp->addItem(tr("Starting bootloader installation"),LOGINFO);
+    connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool)));
     
     if(m_bootloadermethod == "gigabeatf")
     {
@@ -82,6 +83,7 @@ void BootloaderInstaller::uninstall(ProgressloggerInterface* dp)
     m_dp = dp;
     m_install = false;
     m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO);
+    connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool)));
     
     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 
 ***************************************************/
diff --git a/rbutil/rbutilqt/installbootloader.h b/rbutil/rbutilqt/installbootloader.h
index 5a3c02b117..55c415e0ca 100644
--- a/rbutil/rbutilqt/installbootloader.h
+++ b/rbutil/rbutilqt/installbootloader.h
@@ -65,6 +65,7 @@ private slots:
     void updateDataReadProgress(int, int);
     void downloadDone(bool);
     void downloadRequestFinished(int, bool);
+    void installEnded(bool);
     
     // gigabeat specific routines
     void gigabeatPrepare();