napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #963 from bill-auger/patch-3

Browse Source 
move thisModule->isLoaded assert to after its warning message
This commit is contained in:
Adriaan de Groot 2018-05-22 12:06:58 +02:00 committed by GitHub
commit a9306eb5be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -290,10 +290,10 @@ ModuleManager::loadModules()
// If it's a ViewModule, it also appends the ViewStep to the ViewManager. // If it's a ViewModule, it also appends the ViewStep to the ViewManager.
thisModule->loadSelf(); thisModule->loadSelf();
m_loadedModulesByInstanceKey.insert( instanceKey, thisModule ); m_loadedModulesByInstanceKey.insert( instanceKey, thisModule );
Q_ASSERT( thisModule->isLoaded() );
if ( !thisModule->isLoaded() ) if ( !thisModule->isLoaded() )
{ {
cWarning() << "Module" << moduleName << "loading FAILED"; cWarning() << "Module" << moduleName << "loading FAILED";
Q_ASSERT( thisModule->isLoaded() );
continue; continue;
} }
} }