From edade9423f05ee3bcd8d13c13a637f13a93ed9fb Mon Sep 17 00:00:00 2001 From: Philip Date: Fri, 23 Dec 2016 09:45:39 +0100 Subject: [PATCH] [users] Fix reading shells from the config file. --- src/modules/users/UsersViewStep.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index 782a6a846..609e9d8d4 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -22,6 +22,7 @@ #include "JobQueue.h" #include "GlobalStorage.h" +#include "utils/Logger.h" CALAMARES_PLUGIN_FACTORY_DEFINITION( UsersViewStepFactory, registerPlugin(); ) @@ -161,9 +162,14 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } if ( configurationMap.contains( "availableShells" ) && - configurationMap.value( "availableShells" ).type() == QVariant::List ) + configurationMap.value( "availableShells" ).type() == QVariant::String ) { - m_widget->setAvailableShells( configurationMap.value( "availableShells" ).toStringList() ); + QStringList shells; + for (QString& shell : configurationMap.value( "availableShells" ).toString().split(",")) { + shells.append( shell.trimmed() ); + } + + m_widget->setAvailableShells(shells); } if ( configurationMap.contains( "avatarFilePath" ) &&