@ -176,16 +176,10 @@ ModuleManager::loadModules()
QTimer : : singleShot ( 0 , this , [ this ] ( )
QTimer : : singleShot ( 0 , this , [ this ] ( )
{
{
QStringList failedModules = checkDependencies ( ) ;
QStringList failedModules = checkDependencies ( ) ;
if ( ! failedModules . isEmpty ( ) )
{
emit modulesFailed ( failedModules ) ;
return ;
}
Settings : : InstanceDescriptionList customInstances =
Settings : : InstanceDescriptionList customInstances =
Settings : : instance ( ) - > customModuleInstances ( ) ;
Settings : : instance ( ) - > customModuleInstances ( ) ;
const auto modulesSequence = Settings: : instance ( ) - > modules Sequence( ) ;
const auto modulesSequence = failedModules . isEmpty ( ) ? Settings : : instance ( ) - > modulesSequence ( ) : Settings : : ModuleSequence ( ) ;
for ( const auto & modulePhase : modulesSequence )
for ( const auto & modulePhase : modulesSequence )
{
{
ModuleAction currentAction = modulePhase . first ;
ModuleAction currentAction = modulePhase . first ;
@ -336,7 +330,7 @@ ModuleManager::checkDependencies()
somethingWasRemovedBecauseOfUnmetDependencies = true ;
somethingWasRemovedBecauseOfUnmetDependencies = true ;
m_availableDescriptorsByModuleName . erase ( it ) ;
m_availableDescriptorsByModuleName . erase ( it ) ;
failed < < moduleName ;
failed < < moduleName ;
cWarning ( ) < < " Module " < < moduleName < < " has un met requirement" < < depName ;
cWarning ( ) < < " Module " < < moduleName < < " has un known requirement" < < depName ;
break ;
break ;
}
}
}
}