Fix handling of .iso files

Do not let libarchive treat iso as archive that needs to be
extracted.
This commit is contained in:
Floris Bos 2021-01-26 22:17:56 +01:00
parent abbed47f97
commit ab29b218af
2 changed files with 3 additions and 2 deletions

View file

@ -138,7 +138,8 @@ void DownloadExtractThread::extractImageRun()
int r; int r;
archive_read_support_filter_all(a); archive_read_support_filter_all(a);
archive_read_support_format_all(a); archive_read_support_format_zip(a);
archive_read_support_format_7zip(a);
archive_read_support_format_raw(a); // for .gz and such archive_read_support_format_raw(a); // for .gz and such
archive_read_open(a, this, NULL, &DownloadExtractThread::_archive_read, &DownloadExtractThread::_archive_close); archive_read_open(a, this, NULL, &DownloadExtractThread::_archive_read, &DownloadExtractThread::_archive_close);

View file

@ -502,7 +502,7 @@ void ImageWriter::openFileDialog()
QFileDialog *fd = new QFileDialog(nullptr, tr("Select image"), QFileDialog *fd = new QFileDialog(nullptr, tr("Select image"),
path, path,
"Image files (*.img *.zip *.gz *.xz);;All files (*.*)"); "Image files (*.img *.zip *.iso *.gz *.xz);;All files (*.*)");
connect(fd, SIGNAL(fileSelected(QString)), SLOT(onFileSelected(QString))); connect(fd, SIGNAL(fileSelected(QString)), SLOT(onFileSelected(QString)));
if (_engine) if (_engine)