From ab29b218af1a592f16dd34a8c8bd64da814d11aa Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Tue, 26 Jan 2021 22:17:56 +0100 Subject: [PATCH] Fix handling of .iso files Do not let libarchive treat iso as archive that needs to be extracted. --- downloadextractthread.cpp | 3 ++- imagewriter.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/downloadextractthread.cpp b/downloadextractthread.cpp index 09399f2..399dacc 100644 --- a/downloadextractthread.cpp +++ b/downloadextractthread.cpp @@ -138,7 +138,8 @@ void DownloadExtractThread::extractImageRun() int r; 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_open(a, this, NULL, &DownloadExtractThread::_archive_read, &DownloadExtractThread::_archive_close); diff --git a/imagewriter.cpp b/imagewriter.cpp index b60fa52..be42934 100644 --- a/imagewriter.cpp +++ b/imagewriter.cpp @@ -502,7 +502,7 @@ void ImageWriter::openFileDialog() QFileDialog *fd = new QFileDialog(nullptr, tr("Select image"), 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))); if (_engine)