summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2023-07-09 19:27:41 -0400
committerGravatar GitHub2023-07-09 19:27:41 -0400
commit79e289404bd62687273716d1c4b0b88c67349594 (patch)
tree9a9c337529a154441f3fb1c4fa5e4b54ae0ffd80
parentMerge pull request #11063 from liamwhite/oops (diff)
parentsettings: Catch runtime error from STL (diff)
downloadyuzu-79e289404bd62687273716d1c4b0b88c67349594.tar.gz
yuzu-79e289404bd62687273716d1c4b0b88c67349594.tar.xz
yuzu-79e289404bd62687273716d1c4b0b88c67349594.zip
Merge pull request #11055 from lat9nq/tzdb-catch-
settings: Catch runtime error from STL
Diffstat (limited to '')
-rw-r--r--src/common/settings.cpp5
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;