summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-14 17:02:00 +0200
committerGitHub <noreply@github.com>2020-08-14 17:02:00 +0200
commitf482b4b40de1f8bd89cc555c7219efe0497c38f6 (patch)
treece75d5f27131b01f1bbdfe11b042334a2c74bb14 /src
parentMerge pull request #4495 from lioncash/conv (diff)
parenttime_zone_content_manager: Collapse auto and default case (diff)
downloadyuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar.gz
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar.bz2
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar.lz
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar.xz
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar.zst
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/time/time_zone_content_manager.cpp4
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;
}