diff options
| author | 2023-07-09 02:26:58 -0400 | |
|---|---|---|
| committer | 2023-07-09 02:26:58 -0400 | |
| commit | 125519673156581b509ec5a8bcfc7f8c5f68ee0b (patch) | |
| tree | ed98e95fefd8bec89b2a1f5b3b47b308031a862d | |
| parent | Merge pull request #11030 from lat9nq/tz-restrict-msvc (diff) | |
| download | yuzu-125519673156581b509ec5a8bcfc7f8c5f68ee0b.tar.gz yuzu-125519673156581b509ec5a8bcfc7f8c5f68ee0b.tar.xz yuzu-125519673156581b509ec5a8bcfc7f8c5f68ee0b.zip | |
settings: Catch runtime error from STL
This function throws a runtime error we can catch on old Windows 10
installs, so we can catch it here rather than disable this path for
everybody.
Diffstat (limited to '')
| -rw-r--r-- | src/common/settings.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index c81909a06..5972480e5 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -26,10 +26,9 @@ 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 && !defined(_MSC_VER) | 29 | #if __cpp_lib_chrono >= 201907L |
| 30 | // TODO: Remove `!defined(_MSC_VER)` when we no longer support Windows 10 1809 LTSC | ||
| 31 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); | ||
| 32 | try { | 30 | try { |
| 31 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); | ||
| 33 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); | 32 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); |
| 34 | std::string_view current_zone_name = current_zone->name(); | 33 | std::string_view current_zone_name = current_zone->name(); |
| 35 | location_name = current_zone_name; | 34 | location_name = current_zone_name; |