mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 05:05:20 -05:00
Fix issues with mi4 bootloader install:
- return correct success result. Fixes automatic install hanging. - when reinstalling the bootloader (OF.mi4 present) remove Rockbox bootloader first. Fixes sinstall failing silently. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19474 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
a59ec17edb
commit
cd5f753f5e
1 changed files with 9 additions and 3 deletions
|
|
@ -47,8 +47,14 @@ void BootloaderInstallMi4::installStage2(void)
|
||||||
QFile oldbl(fwfile);
|
QFile oldbl(fwfile);
|
||||||
QString moved = QFileInfo(resolvePathCase(m_blfile)).absolutePath()
|
QString moved = QFileInfo(resolvePathCase(m_blfile)).absolutePath()
|
||||||
+ "/OF.mi4";
|
+ "/OF.mi4";
|
||||||
qDebug() << "renaming" << fwfile << "->" << moved;
|
if(!QFileInfo(moved).exists()) {
|
||||||
oldbl.rename(moved);
|
qDebug() << "renaming" << fwfile << "->" << moved;
|
||||||
|
oldbl.rename(moved);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
qDebug() << "OF.mi4 already present, not renaming again.";
|
||||||
|
oldbl.remove();
|
||||||
|
}
|
||||||
|
|
||||||
// place new bootloader
|
// place new bootloader
|
||||||
m_tempfile.open();
|
m_tempfile.open();
|
||||||
|
|
@ -59,7 +65,7 @@ void BootloaderInstallMi4::installStage2(void)
|
||||||
emit logItem(tr("Bootloader successful installed"), LOGOK);
|
emit logItem(tr("Bootloader successful installed"), LOGOK);
|
||||||
logInstall(LogAdd);
|
logInstall(LogAdd);
|
||||||
|
|
||||||
emit done(true);
|
emit done(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue