diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 403d13a760..958550e880 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -708,7 +708,14 @@ void RbUtilQt::installBootloader() | |||
708 | logger->setFinished(); | 708 | logger->setFinished(); |
709 | return; | 709 | return; |
710 | } | 710 | } |
711 | 711 | ||
712 | // the bootloader install class does NOT use any GUI stuff. | ||
713 | // All messages are passed via signals. | ||
714 | connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); | ||
715 | connect(bl, SIGNAL(done(bool)), this, SLOT(installBootloaderPost(bool))); | ||
716 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | ||
717 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | ||
718 | |||
712 | // set bootloader filename. Do this now as installed() needs it. | 719 | // set bootloader filename. Do this now as installed() needs it. |
713 | QStringList blfile = SystemInfo::value(SystemInfo::CurBootloaderFile).toStringList(); | 720 | QStringList blfile = SystemInfo::value(SystemInfo::CurBootloaderFile).toStringList(); |
714 | QStringList blfilepath; | 721 | QStringList blfilepath; |
@@ -788,16 +795,14 @@ void RbUtilQt::installBootloader() | |||
788 | m_error = true; | 795 | m_error = true; |
789 | return; | 796 | return; |
790 | } | 797 | } |
791 | bl->setOfFile(offile); | 798 | if(!bl->setOfFile(offile, blfile)) { |
799 | logger->addItem(tr("Error reading firmware file"), LOGERROR); | ||
800 | logger->setFinished(); | ||
801 | m_error = true; | ||
802 | return; | ||
803 | } | ||
792 | } | 804 | } |
793 | 805 | ||
794 | // the bootloader install class does NOT use any GUI stuff. | ||
795 | // All messages are passed via signals. | ||
796 | connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); | ||
797 | connect(bl, SIGNAL(done(bool)), this, SLOT(installBootloaderPost(bool))); | ||
798 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | ||
799 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | ||
800 | |||
801 | // start install. | 806 | // start install. |
802 | if(!backupDestination.isEmpty()) { | 807 | if(!backupDestination.isEmpty()) { |
803 | if(!bl->backup(backupDestination)) { | 808 | if(!bl->backup(backupDestination)) { |