From d7ce137c11ca63eebe816eedcda1fb1f058ad8bb Mon Sep 17 00:00:00 2001 From: kh1 Date: Wed, 9 Apr 2014 13:43:33 +0200 Subject: Calculate the component order before using it. Change-Id: Ic96b45f013e5f7f740677542ca07914adf7a48d2 Reviewed-by: Kai Koehne --- src/libs/installer/packagemanagercore_p.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libs') diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index c73a7fc82..8fcee1a7f 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1499,6 +1499,7 @@ bool PackageManagerCorePrivate::runInstaller() ProgressCoordinator::instance()->addManualPercentagePoints(1); ProgressCoordinator::instance()->emitLabelAndDetailTextChanged(tr("Preparing the installation...")); + m_core->calculateComponentsToInstall(); const QList componentsToInstall = m_core->orderedComponentsToInstall(); qDebug() << "Install size:" << componentsToInstall.size() << "components"; @@ -1510,7 +1511,7 @@ bool PackageManagerCorePrivate::runInstaller() } if (!adminRightsGained) { - foreach (Component *component, m_core->orderedComponentsToInstall()) { + foreach (Component *component, componentsToInstall) { if (component->value(scRequiresAdminRights, scFalse) == scFalse) continue; -- cgit v1.2.3