From 6056202ead2cb80bebf4b9b07bd418c1a000bce3 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Wed, 31 Oct 2018 00:52:32 -0500 Subject: Fix crash when 7-zip fails to extract a file A thread is spun off to handle the extraction while the main thread handles the progress bar updates. Previously, a dialog was spawned in the thread when an error in 7-zip occurred. Now, the thread will terminate and pass the error message back to the main thread who will spawn the dialog. --- src/installationmanager.cpp | 6 +++++- src/installationmanager.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 5c8b6897..64e58358 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -451,7 +451,7 @@ void InstallationManager::updateProgressFile(QString const &fileName) void InstallationManager::report7ZipError(QString const &errorMessage) { - reportError(errorMessage); + m_ErrorMessage = errorMessage; m_ArchiveHandler->cancel(); } @@ -608,7 +608,11 @@ bool InstallationManager::doInstall(GuessedValue &modName, QString game } while (!future.isFinished()); if (!future.result()) { if (m_ArchiveHandler->getLastError() == Archive::ERROR_EXTRACT_CANCELLED) { + if (!m_ErrorMessage.isEmpty()) { + throw MyException(QString("extracting failed (%1)").arg(m_ErrorMessage)); + } else { return false; + } } else { throw MyException(QString("extracting failed (%1)").arg(m_ArchiveHandler->getLastError())); } diff --git a/src/installationmanager.h b/src/installationmanager.h index 5160d137..7c43b4e2 100644 --- a/src/installationmanager.h +++ b/src/installationmanager.h @@ -212,6 +212,7 @@ private: Archive *m_ArchiveHandler; QString m_CurrentFile; + QString m_ErrorMessage; QProgressDialog *m_InstallationProgress { nullptr }; int m_Progress; -- cgit v1.3.1