diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp index 73f89091b..1beb71d2e 100644 --- a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp +++ b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp @@ -107,10 +107,10 @@ void PlasmaLnfViewStep::onLeave() } -Calamares::JobList +QList<Calamares::job_ptr> PlasmaLnfViewStep::jobs() const { - Calamares::JobList l; + QList<Calamares::job_ptr> l; cDebug() << "Creating Plasma LNF jobs .."; if ( !m_themeId.isEmpty() && !m_lnfPath.isEmpty() ) @@ -124,7 +124,10 @@ PlasmaLnfViewStep::jobs() const void PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - m_lnfPath = CalamaresUtils::getString( configurationMap, "lnftool" ); + QString lnfPath; + if ( configurationMap.contains( "lnftool" ) && configurationMap.value( "lnftool" ).type() == QVariant::String ) + lnfPath = configurationMap.value( "lnftool" ).toString(); + m_lnfPath = lnfPath; Calamares::set_lnftool( m_lnfPath ); if (m_lnfPath.isEmpty()) diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.h b/src/modules/plasmalnf/PlasmaLnfViewStep.h index c2bcce2c0..4d2598ccc 100644 --- a/src/modules/plasmalnf/PlasmaLnfViewStep.h +++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h @@ -52,7 +52,7 @@ public: void onLeave() override; - Calamares::JobList jobs() const override; + QList<Calamares::job_ptr> jobs() const override; void setConfigurationMap( const QVariantMap& configurationMap ) override;