diff options
| author |  liamwhite | 2023-07-21 15:05:59 -0400 |
|---|---|---|
| committer |  GitHub | 2023-07-21 15:05:59 -0400 |
| commit | 8927f016e189ea61913cf9f20c9d61e6fa92fb95 (patch) | |
| tree | 20932bee9230cab7970c507f56cae703fa479ec2 /src/common/settings.cpp | |
| parent | Merge pull request #11096 from german77/amiibooo (diff) | |
| parent | time_zone: Clean up includes (diff) | |
| download | yuzu-8927f016e189ea61913cf9f20c9d61e6fa92fb95.tar.gz yuzu-8927f016e189ea61913cf9f20c9d61e6fa92fb95.tar.xz yuzu-8927f016e189ea61913cf9f20c9d61e6fa92fb95.zip | |
Merge pull request #11069 from lat9nq/mingw-no-tzdb
common: Use arithmetic instead of string ops to get time zone
Diffstat (limited to 'src/common/settings.cpp')
| -rw-r--r-- | src/common/settings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 5972480e5..d4e55f988 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -26,7 +26,8 @@ std::string GetTimeZoneString() { | |||
| 26 | 26 | ||
| 27 | std::string location_name; | 27 | std::string location_name; |
| 28 | if (time_zone_index == 0) { // Auto | 28 | if (time_zone_index == 0) { // Auto |
| 29 | #if __cpp_lib_chrono >= 201907L | 29 | #if __cpp_lib_chrono >= 201907L && !defined(MINGW) |
| 30 | // Disabled for MinGW -- tzdb always returns Etc/UTC | ||
| 30 | try { | 31 | try { |
| 31 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); | 32 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); |
| 32 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); | 33 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); |