From 8d99c66491c0bd555b0db698d18d347a824079de Mon Sep 17 00:00:00 2001 From: elecpower Date: Sun, 24 Jul 2022 23:12:53 +1000 Subject: [PATCH] Fix decompress result to calling function --- companion/src/updates/updateinterface.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/companion/src/updates/updateinterface.cpp b/companion/src/updates/updateinterface.cpp index 55aaece16..635df2b88 100644 --- a/companion/src/updates/updateinterface.cpp +++ b/companion/src/updates/updateinterface.cpp @@ -949,9 +949,7 @@ bool UpdateInterface::decompressAsset(int row) progressMessage(tr("Decompressing %1").arg(filename)); reportProgress(tr("Decompress: %1").arg(filename), QtInfoMsg); - decompressArchive(f.absoluteFilePath(), QString("%1/A%2").arg(decompressDir).arg(assets->id())); - - return true; + return decompressArchive(f.absoluteFilePath(), QString("%1/A%2").arg(decompressDir).arg(assets->id())); } bool UpdateInterface::decompressArchive(const QString & archivePath, const QString & destDir) @@ -966,7 +964,7 @@ bool UpdateInterface::decompressArchive(const QString & archivePath, const QStri MinizInterface mIface(progress, MinizInterface::PCM_SIZE, logLevel); if (!mIface.unzipArchiveToPath(archivePath, dest)) { - criticalMsg(tr("Failed to decompress %1").arg(archivePath)); + reportProgress(tr("Failed to decompress %1").arg(archivePath), QtCriticalMsg); return false; }