octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4529 from lioncash/assignment 

time_zone_content_manager: Collapse auto and default case
This commit is contained in:
bunnei 2020-08-14 11:02:00 -04:00 committed by GitHub
parent e050594706 b14277ef97
commit f482b4b40d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/service/time/time_zone_content_manager.cpp
View File

@ -73,10 +73,8 @@ TimeZoneContentManager::TimeZoneContentManager(TimeManager& time_manager, Core::
std::string location_name; std::string location_name;
const auto timezone_setting = Settings::GetTimeZoneString(); const auto timezone_setting = Settings::GetTimeZoneString();
if (timezone_setting == "auto") { if (timezone_setting == "auto" || timezone_setting == "default") {
location_name = Common::TimeZone::GetDefaultTimeZone(); location_name = Common::TimeZone::GetDefaultTimeZone();
} else if (timezone_setting == "default") {
location_name = location_name;
} else { } else {
location_name = timezone_setting; location_name = timezone_setting;
} }