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

[libcalamaresui] Defend against missing config settings

Browse Source
This commit is contained in:
Adriaan de Groot 2019-01-14 15:30:44 +01:00
parent ef94b1f689
commit 12665192ae
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libcalamaresui/Branding.cpp
View File

@ -305,6 +305,16 @@ Branding::WindowDimension::isValid() const
return ( unit() != none ) && ( value() > 0 ); return ( unit() != none ) && ( value() > 0 );
} }
/// @brief Guard against cases where the @p key doesn't exist in @p doc
static inline QString
getString( const YAML::Node& doc, const char* key )
{
if ( doc[key] )
return QString::fromStdString( doc[key].as< std::string >() );
return QString();
}
void void
Branding::initSimpleSettings( const YAML::Node& doc ) Branding::initSimpleSettings( const YAML::Node& doc )
{ {
@ -322,11 +332,11 @@ Branding::initSimpleSettings( const YAML::Node& doc )
m_welcomeStyleCalamares = doc[ "welcomeStyleCalamares" ].as< bool >( false ); m_welcomeStyleCalamares = doc[ "welcomeStyleCalamares" ].as< bool >( false );
m_welcomeExpandingLogo = doc[ "welcomeExpandingLogo" ].as< bool >( true ); m_welcomeExpandingLogo = doc[ "welcomeExpandingLogo" ].as< bool >( true );
m_windowExpansion = expansionNames.find( QString::fromStdString( doc[ "windowExpanding" ].as< std::string >() ), ok ); m_windowExpansion = expansionNames.find( getString( doc, "windowExpanding" ), ok );
if ( !ok ) if ( !ok )
cWarning() << "Branding module-setting *windowExpanding* interpreted as" << expansionNames.find( m_windowExpansion, ok ); cWarning() << "Branding module-setting *windowExpanding* interpreted as" << expansionNames.find( m_windowExpansion, ok );
QString windowSize = QString::fromStdString( doc[ "windowSize" ].as< std::string >() ); QString windowSize = getString( doc, "windowSize" );
if ( !windowSize.isEmpty() ) if ( !windowSize.isEmpty() )
{ {
auto l = windowSize.split( ',' ); auto l = windowSize.split( ',' );