summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/installbootloader.cpp9
-rw-r--r--rbutil/rbutilqt/installbootloader.h1
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)
30 m_dp = dp; 30 m_dp = dp;
31 m_install = true; 31 m_install = true;
32 m_dp->addItem(tr("Starting bootloader installation"),LOGINFO); 32 m_dp->addItem(tr("Starting bootloader installation"),LOGINFO);
33 connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool)));
33 34
34 if(m_bootloadermethod == "gigabeatf") 35 if(m_bootloadermethod == "gigabeatf")
35 { 36 {
@@ -82,6 +83,7 @@ void BootloaderInstaller::uninstall(ProgressloggerInterface* dp)
82 m_dp = dp; 83 m_dp = dp;
83 m_install = false; 84 m_install = false;
84 m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO); 85 m_dp->addItem(tr("Starting bootloader uninstallation"),LOGINFO);
86 connect(this, SIGNAL(done(bool)), this, SLOT(installEnded(bool)));
85 87
86 if(m_bootloadermethod == "gigabeatf") 88 if(m_bootloadermethod == "gigabeatf")
87 { 89 {
@@ -171,6 +173,13 @@ void BootloaderInstaller::updateDataReadProgress(int read, int total)
171} 173}
172 174
173 175
176void BootloaderInstaller::installEnded(bool error)
177{
178 (void) error;
179 m_dp->abort();
180}
181
182
174/************************************************** 183/**************************************************
175*** gigabeat secific code 184*** gigabeat secific code
176***************************************************/ 185***************************************************/
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:
65 void updateDataReadProgress(int, int); 65 void updateDataReadProgress(int, int);
66 void downloadDone(bool); 66 void downloadDone(bool);
67 void downloadRequestFinished(int, bool); 67 void downloadRequestFinished(int, bool);
68 void installEnded(bool);
68 69
69 // gigabeat specific routines 70 // gigabeat specific routines
70 void gigabeatPrepare(); 71 void gigabeatPrepare();