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

[partition] refactor config-reading from availableFileSystemTypes

Browse Source
This commit is contained in:
Adriaan de Groot 2021-06-18 12:18:04 +02:00
parent cd804470b5
commit 26cabbb3e4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/partition/core/Config.cpp
View File

@ -256,16 +256,22 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "availableFileSystemTypes" ) ) if ( configurationMap.contains( "availableFileSystemTypes" ) )
{ {
QStringList fsTypes;
if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List ) if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List )
{ {
m_eraseFsTypes.clear(); fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" );
m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toStringList() );
m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ];
} }
else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String ) else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String )
{ {
m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toString() ); fsTypes = QStringList { CalamaresUtils::getString( configurationMap, "availableFileSystemTypes" ) };
m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ]; }
m_eraseFsTypes = fsTypes;
if ( !fsTypes.empty() )
{
m_eraseFsTypeChoice = m_eraseFsTypes.first();
Q_EMIT eraseModeFilesystemChanged( m_eraseFsTypeChoice );
} }
} }