diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-06-27 23:34:16 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-06-28 00:12:26 +0200 |
commit | 32475efbc4326a3e7a97883f39b21b91fd14af60 (patch) | |
tree | 638bd64bae8d976e5406a0e742869a469f60495a | |
parent | Merge pull request #10931 from german77/clang (diff) | |
download | yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.tar yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.tar.gz yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.tar.bz2 yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.tar.lz yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.tar.xz yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.tar.zst yuzu-32475efbc4326a3e7a97883f39b21b91fd14af60.zip |
-rw-r--r-- | src/common/settings.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 66dffc9bf..a1df69140 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include <exception> +#include <stdexcept> #if __cpp_lib_chrono >= 201907L #include <chrono> #endif @@ -25,9 +27,19 @@ std::string GetTimeZoneString() { if (time_zone_index == 0) { // Auto #if __cpp_lib_chrono >= 201907L 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; + try { + 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; + } catch (std::runtime_error& runtime_error) { + // VCRUNTIME will throw a runtime_error if the operating system's selected time zone + // cannot be found + location_name = Common::TimeZone::FindSystemTimeZone(); + LOG_WARNING(Common, + "Error occurred when trying to determine system time zone:\n{}\nFalling " + "back to hour offset \"{}\"", + runtime_error.what(), location_name); + } #else location_name = Common::TimeZone::FindSystemTimeZone(); #endif |