rbutil: enable "done" signal on bootloader uninstall
This allows to implement multi-stage uninstallers. Should not affect the behaviour on current targets. Change-Id: Idf8aec5caf76cf9317798890d094a7cebdbcabec
This commit is contained in:
parent
6a1644c52a
commit
5a673d6df2
7 changed files with 8 additions and 2 deletions
|
@ -185,6 +185,7 @@ bool BootloaderInstallAms::uninstall(void)
|
|||
emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
|
||||
"original firmware"), LOGINFO);
|
||||
logInstall(LogRemove);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -236,6 +236,7 @@ bool BootloaderInstallHex::uninstall(void)
|
|||
{
|
||||
emit logItem(tr("Uninstallation not possible, only installation info removed"), LOGINFO);
|
||||
logInstall(LogRemove);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -175,6 +175,7 @@ bool BootloaderInstallImx::uninstall(void)
|
|||
emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
|
||||
"original firmware."), LOGINFO);
|
||||
logInstall(LogRemove);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -91,6 +91,7 @@ bool BootloaderInstallMi4::uninstall(void)
|
|||
emit logItem(tr("Checking for Rockbox bootloader"), LOGINFO);
|
||||
if(installed() != BootloaderRockbox) {
|
||||
emit logItem(tr("No Rockbox bootloader found"), LOGERROR);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -101,6 +102,7 @@ bool BootloaderInstallMi4::uninstall(void)
|
|||
|
||||
if(Utils::resolvePathCase(original).isEmpty()) {
|
||||
emit logItem(tr("Error finding original firmware file"), LOGERROR);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -127,6 +127,7 @@ bool BootloaderInstallMpio::uninstall(void)
|
|||
emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
|
||||
"original firmware"), LOGINFO);
|
||||
logInstall(LogRemove);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -150,6 +150,7 @@ bool BootloaderInstallTcc::uninstall(void)
|
|||
{
|
||||
emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified original firmware"), LOGINFO);
|
||||
logInstall(LogRemove);
|
||||
emit done(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -569,11 +569,10 @@ void RbUtilQt::uninstallBootloader(void)
|
|||
|
||||
connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||
connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||
connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished()));
|
||||
|
||||
bl->uninstall();
|
||||
|
||||
logger->setFinished();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue