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

[partition] Canonicalize the FS choice for erase

Browse Source
This commit is contained in:
Adriaan de Groot 2021-06-18 11:51:33 +02:00
parent d8a862ec82
commit cd804470b5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@
#include "Config.h" #include "Config.h"
#include "PartUtils.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -210,11 +212,11 @@ Config::setSwapChoice( Config::SwapChoice c )
void void
Config::setEraseFsTypeChoice( const QString& choice ) Config::setEraseFsTypeChoice( const QString& choice )
{ {
if ( choice != m_eraseFsTypeChoice ) QString canonicalChoice = PartUtils::canonicalFilesystemName( choice, nullptr );
if ( canonicalChoice != m_eraseFsTypeChoice )
{ {
// FIXME: shouldn't this be a canonical fs name? m_eraseFsTypeChoice = canonicalChoice;
m_eraseFsTypeChoice = choice; Q_EMIT eraseModeFilesystemChanged( canonicalChoice );
Q_EMIT eraseModeFilesystemChanged( choice );
} }
} }