applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 03:15:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[locale] Avoid nullptr if there is no location

Browse source
This commit is contained in:
Adriaan de Groot 2020-07-22 00:32:29 +02:00
parent 0c9480aa3f
commit 781d76c9e5
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/locale/Config.cpp
View file

@ -255,6 +255,11 @@ Config::setCurrentLocation( const CalamaresUtils::Locale::TZZone* location )
LocaleConfiguration LocaleConfiguration
Config::automaticLocaleConfiguration() const Config::automaticLocaleConfiguration() const
{ {
// Special case: no location has been set at **all**
if ( !currentLocation() )
{
return LocaleConfiguration();
}
return LocaleConfiguration::fromLanguageAndLocation( return LocaleConfiguration::fromLanguageAndLocation(
QLocale().name(), supportedLocales(), currentLocation()->country() ); QLocale().name(), supportedLocales(), currentLocation()->country() );
} }