diff options
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index eeca32857..c3fd07ac4 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -2510,11 +2510,14 @@ bool PackageManagerCorePrivate::calculateComponentsAndRun() { QString htmlOutput; bool componentsOk = m_core->calculateComponents(&htmlOutput); - qCDebug(QInstaller::lcInstallerInstallLog).noquote() << htmlToString(htmlOutput); - if (componentsOk && acceptLicenseAgreements()) { - return m_core->run(); + bool success = false; + if (statusCanceledOrFailed()) { + qCDebug(QInstaller::lcInstallerInstallLog) << "Installation canceled."; + } else if (componentsOk && acceptLicenseAgreements()) { + qCDebug(QInstaller::lcInstallerInstallLog).noquote() << htmlToString(htmlOutput); + success = m_core->run(); } - return false; + return success; } bool PackageManagerCorePrivate::acceptLicenseAgreements() |