settings: Require time zone setting value for stirng
This commit is contained in:
parent
07e8477f5a
commit
ff6a5031d5
|
@ -66,8 +66,8 @@ SWITCHABLE(u8, true);
|
|||
|
||||
Values values;
|
||||
|
||||
std::string GetTimeZoneString() {
|
||||
const auto time_zone_index = static_cast<std::size_t>(values.time_zone_index.GetValue());
|
||||
std::string GetTimeZoneString(TimeZone time_zone) {
|
||||
const auto time_zone_index = static_cast<std::size_t>(time_zone);
|
||||
ASSERT(time_zone_index < Common::TimeZone::GetTimeZoneStrings().size());
|
||||
|
||||
std::string location_name;
|
||||
|
|
|
@ -516,7 +516,7 @@ bool IsFastmemEnabled();
|
|||
|
||||
float Volume();
|
||||
|
||||
std::string GetTimeZoneString();
|
||||
std::string GetTimeZoneString(TimeZone time_zone);
|
||||
|
||||
void LogSettings();
|
||||
|
||||
|
|
|
@ -76,7 +76,8 @@ TimeZoneContentManager::TimeZoneContentManager(Core::System& system_)
|
|||
: system{system_}, location_name_cache{BuildLocationNameCache(system)} {}
|
||||
|
||||
void TimeZoneContentManager::Initialize(TimeManager& time_manager) {
|
||||
const auto timezone_setting = Settings::GetTimeZoneString();
|
||||
const auto timezone_setting =
|
||||
Settings::GetTimeZoneString(Settings::values.time_zone_index.GetValue());
|
||||
|
||||
if (FileSys::VirtualFile vfs_file;
|
||||
GetTimeZoneInfoFile(timezone_setting, vfs_file) == ResultSuccess) {
|
||||
|
|
|
@ -318,7 +318,8 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
|
|||
{
|
||||
{static_cast<u32>(Settings::TimeZone::Auto),
|
||||
tr("Auto (%1)", "Auto select time zone")
|
||||
.arg(QString::fromStdString(Settings::GetTimeZoneString()))},
|
||||
.arg(QString::fromStdString(
|
||||
Settings::GetTimeZoneString(Settings::TimeZone::Auto)))},
|
||||
{static_cast<u32>(Settings::TimeZone::Default),
|
||||
tr("Default (%1)", "Default time zone")
|
||||
.arg(QString::fromStdString(Common::TimeZone::GetDefaultTimeZone()))},
|
||||
|
|
Loading…
Reference in New Issue