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

[welcome] Handle nullptrs nicely in Config

Browse Source 
- Branding, Settings, and ModuleManager may all be nullptr,
  in which case the corresponding code shouldn't call methods
  of those instances -- this is demonstrated by just creating
  a Config object
This commit is contained in:
Adriaan de Groot 2021-08-24 12:50:03 +02:00
parent 1e05e7996b
commit e0ee2d9514
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/welcome/Config.cpp
View File

@ -40,14 +40,16 @@ Config::retranslate()
{ {
cWarning() << "Retranslated to" << QLocale().name(); cWarning() << "Retranslated to" << QLocale().name();
m_genericWelcomeMessage = genericWelcomeMessage().arg( Calamares::Branding::instance()->versionedName() ); const auto* branding = Calamares::Branding::instance();
const auto* settings = Calamares::Settings::instance();
m_genericWelcomeMessage = genericWelcomeMessage().arg( branding ? branding->versionedName() : QString() );
emit genericWelcomeMessageChanged( m_genericWelcomeMessage ); emit genericWelcomeMessageChanged( m_genericWelcomeMessage );
const auto* r = requirementsModel(); const auto* r = requirementsModel();
if ( !r->satisfiedRequirements() ) if ( r && !r->satisfiedRequirements() )
{ {
QString message; QString message;
const bool setup = Calamares::Settings::instance()->isSetupMode(); const bool setup = settings ? settings->isSetupMode() : false;
if ( !r->satisfiedMandatory() ) if ( !r->satisfiedMandatory() )
{ {
@ -72,13 +74,13 @@ Config::retranslate()
"might be disabled." ); "might be disabled." );
} }
m_warningMessage = message.arg( Calamares::Branding::instance()->shortVersionedName() ); m_warningMessage = message.arg( branding ? branding->shortVersionedName() : QString() );
} }
else else
{ {
m_warningMessage = tr( "This program will ask you some questions and " m_warningMessage = tr( "This program will ask you some questions and "
"set up %2 on your computer." ) "set up %2 on your computer." )
.arg( Calamares::Branding::instance()->productName() ); .arg( branding ? branding->productName() : QString() );
} }
emit warningMessageChanged( m_warningMessage ); emit warningMessageChanged( m_warningMessage );
@ -93,7 +95,8 @@ Config::languagesModel() const
Calamares::RequirementsModel* Calamares::RequirementsModel*
Config::requirementsModel() const Config::requirementsModel() const
{ {
return Calamares::ModuleManager::instance()->requirementsModel(); auto* manager = Calamares::ModuleManager::instance();
return manager ? manager->requirementsModel() : nullptr;
} }
QAbstractItemModel* QAbstractItemModel*
@ -241,17 +244,19 @@ Config::genericWelcomeMessage() const
{ {
QString message; QString message;
if ( Calamares::Settings::instance()->isSetupMode() ) const auto* settings = Calamares::Settings::instance();
const auto* branding = Calamares::Branding::instance();
const bool welcomeStyle = branding ? branding->welcomeStyleCalamares() : true;
if ( settings ? settings->isSetupMode() : false )
{ {
message = Calamares::Branding::instance()->welcomeStyleCalamares() message = welcomeStyle ? tr( "<h1>Welcome to the Calamares setup program for %1</h1>" )
? tr( "<h1>Welcome to the Calamares setup program for %1</h1>" ) : tr( "<h1>Welcome to %1 setup</h1>" );
: tr( "<h1>Welcome to %1 setup</h1>" );
} }
else else
{ {
message = Calamares::Branding::instance()->welcomeStyleCalamares() message = welcomeStyle ? tr( "<h1>Welcome to the Calamares installer for %1</h1>" )
? tr( "<h1>Welcome to the Calamares installer for %1</h1>" ) : tr( "<h1>Welcome to the %1 installer</h1>" );
: tr( "<h1>Welcome to the %1 installer</h1>" );
} }
return message; return message;