applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 17:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug with RAM/storage required settings being ignored if set as int.

Browse source
This commit is contained in:
Teo Mrnjavac 2016-05-02 18:08:29 +02:00
parent 2dcfdc0170
commit a9c87e2f14
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/welcome/checker/RequirementsChecker.cpp
View file

@ -186,7 +186,8 @@ void
RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap ) RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
{ {
if ( configurationMap.contains( "requiredStorage" ) && if ( configurationMap.contains( "requiredStorage" ) &&
configurationMap.value( "requiredStorage" ).type() == QVariant::Double ) ( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
{ {
bool ok = false; bool ok = false;
m_requiredStorageGB = configurationMap.value( "requiredStorage" ).toDouble( &ok ); m_requiredStorageGB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
@ -201,7 +202,8 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
} }
if ( configurationMap.contains( "requiredRam" ) && if ( configurationMap.contains( "requiredRam" ) &&
configurationMap.value( "requiredRam" ).type() == QVariant::Double ) ( configurationMap.value( "requiredRam" ).type() == QVariant::Double ||
configurationMap.value( "requiredRam" ).type() == QVariant::Int ) )
{ {
bool ok = false; bool ok = false;
m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok ); m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok );