summaryrefslogtreecommitdiff
path: root/src/common/settings.cpp
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2023-07-09 19:27:41 -0400
committerGitHub <noreply@github.com>2023-07-09 19:27:41 -0400
commit79e289404bd62687273716d1c4b0b88c67349594 (patch)
tree9a9c337529a154441f3fb1c4fa5e4b54ae0ffd80 /src/common/settings.cpp
parent8a87a41f2da01e65ecfcd1787237578c2f14ec06 (diff)
parent125519673156581b509ec5a8bcfc7f8c5f68ee0b (diff)
Merge pull request #11055 from lat9nq/tzdb-catch-
settings: Catch runtime error from STL
Diffstat (limited to 'src/common/settings.cpp')
-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() {
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;