summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/scripts/windows/docker.sh1
-rw-r--r--src/common/settings.cpp5
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
56 x86_64-w64-mingw32-strip "${i}" 56 x86_64-w64-mingw32-strip "${i}"
57done 57done
58 58
59pip3 install pefile
60python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" 59python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/"
61 60
62# copy FFmpeg libraries 61# 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() {
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;