diff options
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 1 | ||||
| -rw-r--r-- | src/common/settings.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index 0be3613aa..45f75c874 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -56,7 +56,6 @@ for i in package/*.exe; do x86_64-w64-mingw32-strip "${i}" done -pip3 install pefile python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" # copy FFmpeg libraries 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; |