VERY experimental Nintendo Switch 2 emulator
C++
settings: Catch runtime_error, fallback time zone
lat9nq4bbb9fa29e00
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex 66dffc9bf4..a1df691407 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 >= 201907Lconst 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);+ }#elselocation_name = Common::TimeZone::FindSystemTimeZone();#endif