From 125519673156581b509ec5a8bcfc7f8c5f68ee0b Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:26:58 -0400 Subject: [PATCH] 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. --- src/common/settings.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index c81909a063..5972480e51 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -26,10 +26,9 @@ std::string GetTimeZoneString() { std::string location_name; if (time_zone_index == 0) { // Auto -#if __cpp_lib_chrono >= 201907L && !defined(_MSC_VER) - // TODO: Remove `!defined(_MSC_VER)` when we no longer support Windows 10 1809 LTSC - const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); +#if __cpp_lib_chrono >= 201907L try { + const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); std::string_view current_zone_name = current_zone->name(); location_name = current_zone_name;