len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-12 14:42:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Fix Xduoo bootloader installation.

Browse source 
- Don't try to unzip the bootloader file if we're actually looking for a
  zip file.
- Fix wrong bootloader file name for X3.
- There's no QThread::terminated() signal, don't connect it.

Change-Id: Iebfcc61d644c8443b60d9b37f4932d7b46098465
This commit is contained in:
Dominik Riebeling 2020-08-23 16:51:44 +02:00
parent 53dedd47b9
commit 0b5f0b9284
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rbutil/rbutilqt/base/bootloaderinstallbase.cpp
View file

@ -224,11 +224,20 @@ void BootloaderInstallBase::setBlFile(QStringList sl)
bool BootloaderInstallBase::setOfFile(QString of, QStringList blfile)
{
bool found = false;
ArchiveUtil *util = 0;
ArchiveUtil *util = nullptr;
// check if we're actually looking for a zip file. If so we must avoid
// trying to unzip it.
bool wantZip = false;
for (int i = 0; i < blfile.size(); i++)
{
if (blfile.at(i).endsWith(".zip"))
wantZip = true;
}
// try ZIP first
ZipUtil *zu = new ZipUtil(this);
if(zu->open(of))
if(zu->open(of) && !wantZip)
{
emit logItem(tr("Zip file format detected"), LOGINFO);
util = zu;