From fe107ac7622067c0b99ff61c52a9b2c5d6296dd1 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 10 Jun 2016 15:41:53 +0200
Subject: [PATCH] Obey default FS type setting in EditExistingPartitionDialog.

---
 src/modules/partition/gui/EditExistingPartitionDialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index f9998fa6a..f9e3a7c41 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -100,7 +100,9 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit
     if ( fsNames.contains( m_partition->fileSystem().name() ) )
         m_ui->fileSystemComboBox->setCurrentText( m_partition->fileSystem().name() );
     else
-        m_ui->fileSystemComboBox->setCurrentText( FileSystem::nameForType( FileSystem::Ext4 ) );
+        m_ui->fileSystemComboBox->setCurrentText( Calamares::JobQueue::instance()->
+                                                      globalStorage()->
+                                                      value( "defaultFileSystemType" ).toString() );
 
     m_ui->fileSystemLabel->setEnabled( m_ui->formatRadioButton->isChecked() );
     m_ui->fileSystemComboBox->setEnabled( m_ui->formatRadioButton->isChecked() );