diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index c138917d2..53cd0a84e 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -35,6 +35,7 @@ namespace Calamares ModuleManager::ModuleManager( const QStringList& paths, QObject* parent ) : QObject( parent ) , m_paths( paths ) + , m_lastPhaseLoaded( Phase_NULL ) { } @@ -68,6 +69,13 @@ ModuleManager::module( const QString& name ) } +Phase +ModuleManager::currentPhase() +{ + return m_lastPhaseLoaded; +} + + void ModuleManager::loadModules( Phase phase ) { @@ -96,6 +104,7 @@ ModuleManager::loadModules( Phase phase ) doLoad( moduleName ); } emit modulesLoaded( phase ); + m_lastPhaseLoaded = phase; // Loading sequence: // 1) deps are already fine. check if we have all the modules needed by the roster // 2) ask ModuleManager to load them from the list provided by Settings diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h index 77ab0a67b..235ec9b13 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.h +++ b/src/libcalamaresui/modulesystem/ModuleManager.h @@ -48,6 +48,8 @@ public: QStringList availableModules(); Module* module( const QString& name ); + Phase currentPhase(); + void loadModules( Phase phase ); signals: @@ -65,6 +67,7 @@ private: QStringList m_paths; + Phase m_lastPhaseLoaded; }; }