summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2020-08-14 11:02:00 -0400
committerGravatar GitHub2020-08-14 11:02:00 -0400
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.gz
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.tar.xz
yuzu-f482b4b40de1f8bd89cc555c7219efe0497c38f6.zip
Merge pull request #4529 from lioncash/assignment
time_zone_content_manager: Collapse auto and default case
Diffstat (limited to '')
-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::
73 73
74 std::string location_name; 74 std::string location_name;
75 const auto timezone_setting = Settings::GetTimeZoneString(); 75 const auto timezone_setting = Settings::GetTimeZoneString();
76 if (timezone_setting == "auto") { 76 if (timezone_setting == "auto" || timezone_setting == "default") {
77 location_name = Common::TimeZone::GetDefaultTimeZone(); 77 location_name = Common::TimeZone::GetDefaultTimeZone();
78 } else if (timezone_setting == "default") {
79 location_name = location_name;
80 } else { 78 } else {
81 location_name = timezone_setting; 79 location_name = timezone_setting;
82 } 80 }