N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11055 from lat9nq/tzdb-catch-

Browse source 
settings: Catch runtime error from STL
This commit is contained in:
Morph 2023-07-09 19:27:41 -04:00 committed by GitHub
commit 79e289404b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/settings.cpp
View file

@ -26,10 +26,9 @@ std::string GetTimeZoneString() {
std::string location_name; std::string location_name;
if (time_zone_index == 0) { // Auto if (time_zone_index == 0) { // Auto
#if __cpp_lib_chrono >= 201907L && !defined(_MSC_VER) #if __cpp_lib_chrono >= 201907L
// 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();
try { 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(); const std::chrono::time_zone* current_zone = time_zone_data.current_zone();
std::string_view current_zone_name = current_zone->name(); std::string_view current_zone_name = current_zone->name();
location_name = current_zone_name; location_name = current_zone_name;