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() logger->setFinished(); return; } - + + // the bootloader install class does NOT use any GUI stuff. + // All messages are passed via signals. + connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(bl, SIGNAL(done(bool)), this, SLOT(installBootloaderPost(bool))); + connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + // set bootloader filename. Do this now as installed() needs it. QStringList blfile = SystemInfo::value(SystemInfo::CurBootloaderFile).toStringList(); QStringList blfilepath; @@ -788,16 +795,14 @@ void RbUtilQt::installBootloader() m_error = true; return; } - bl->setOfFile(offile); + if(!bl->setOfFile(offile, blfile)) { + logger->addItem(tr("Error reading firmware file"), LOGERROR); + logger->setFinished(); + m_error = true; + return; + } } - // the bootloader install class does NOT use any GUI stuff. - // All messages are passed via signals. - connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); - connect(bl, SIGNAL(done(bool)), this, SLOT(installBootloaderPost(bool))); - connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); - connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); - // start install. if(!backupDestination.isEmpty()) { if(!bl->backup(backupDestination)) { |