diff options
| author | bunnei <bunneidev@gmail.com> | 2020-08-14 11:02:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-14 11:02:00 -0400 |
| commit | f482b4b40de1f8bd89cc555c7219efe0497c38f6 (patch) | |
| tree | ce75d5f27131b01f1bbdfe11b042334a2c74bb14 /src/core/hle | |
| parent | e0505947064e8e8dd4fd145c1f6dcbbb5ae5373f (diff) | |
| parent | b14277ef971e1071a39dd604d34643e597284a8d (diff) | |
Merge pull request #4529 from lioncash/assignment
time_zone_content_manager: Collapse auto and default case
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/time/time_zone_content_manager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/hle/service/time/time_zone_content_manager.cpp b/src/core/hle/service/time/time_zone_content_manager.cpp index c070d6e97..320672add 100644 --- a/src/core/hle/service/time/time_zone_content_manager.cpp +++ b/src/core/hle/service/time/time_zone_content_manager.cpp @@ -73,10 +73,8 @@ TimeZoneContentManager::TimeZoneContentManager(TimeManager& time_manager, Core:: std::string location_name; const auto timezone_setting = Settings::GetTimeZoneString(); - if (timezone_setting == "auto") { + if (timezone_setting == "auto" || timezone_setting == "default") { location_name = Common::TimeZone::GetDefaultTimeZone(); - } else if (timezone_setting == "default") { - location_name = location_name; } else { location_name = timezone_setting; } |