From 26cabbb3e410e6dff1ab3c361df0013699be35ac Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 18 Jun 2021 12:18:04 +0200
Subject: [PATCH] [partition] refactor config-reading from
 availableFileSystemTypes

---
 src/modules/partition/core/Config.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp
index b09f1424d..69dbe17d3 100644
--- a/src/modules/partition/core/Config.cpp
+++ b/src/modules/partition/core/Config.cpp
@@ -256,16 +256,22 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
 
     if ( configurationMap.contains( "availableFileSystemTypes" ) )
     {
+        QStringList fsTypes;
+
         if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List )
         {
-            m_eraseFsTypes.clear();
-            m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toStringList() );
-            m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ];
+            fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" );
         }
         else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String )
         {
-            m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toString() );
-            m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ];
+            fsTypes = QStringList { CalamaresUtils::getString( configurationMap, "availableFileSystemTypes" ) };
+        }
+
+        m_eraseFsTypes = fsTypes;
+        if ( !fsTypes.empty() )
+        {
+            m_eraseFsTypeChoice = m_eraseFsTypes.first();
+            Q_EMIT eraseModeFilesystemChanged( m_eraseFsTypeChoice );
         }
     }