From 04b4e37bd0a1bdac0a04d4050c25f28227f1fd36 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 11 Feb 2019 09:23:50 -0500
Subject: [PATCH] [partition] Don't display unsupported swap styles

 - Suppress unsupported options while reading the config file.
---
 src/modules/partition/gui/PartitionViewStep.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index ac0599de7..b7433450d 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -612,19 +612,20 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         else
             choices.insert( PartitionActions::Choices::SwapChoice::SmallSwap );
     }
-    m_swapChoices = choices;
 
     // Not all are supported right now // FIXME
     static const char unsupportedSetting[] = "Partition-module does not support *userSwapChoices* setting";
 
 #define COMPLAIN_UNSUPPORTED(x) \
     if ( choices.contains( x ) ) \
-    { cWarning() << unsupportedSetting << PartitionActions::Choices::choiceToName( x ); }
+    { cWarning() << unsupportedSetting << PartitionActions::Choices::choiceToName( x ); choices.remove( x ); }
 
     COMPLAIN_UNSUPPORTED( PartitionActions::Choices::SwapChoice::SwapFile )
     COMPLAIN_UNSUPPORTED( PartitionActions::Choices::SwapChoice::ReuseSwap )
 #undef COMPLAIN_UNSUPPORTED
 
+    m_swapChoices = choices;
+
     // These gs settings seem to be unused (in upstream Calamares) outside of
     // the partition module itself.
     gs->insert( "ensureSuspendToDisk", ensureSuspendToDisk );