settings: Catch runtime_error, fallback time zone
Windows will let you select time zones that will fail in their own C++ implementation library. Evidently from the stack trace, we get a runtime error to work with, so catch it and use the fallback.
This commit is contained in:
parent
bd4fefe5e7
commit
32475efbc4
|
@ -1,6 +1,8 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#include <exception>
|
||||||
|
#include <stdexcept>
|
||||||
#if __cpp_lib_chrono >= 201907L
|
#if __cpp_lib_chrono >= 201907L
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#endif
|
#endif
|
||||||
|
@ -25,9 +27,19 @@ std::string GetTimeZoneString() {
|
||||||
if (time_zone_index == 0) { // Auto
|
if (time_zone_index == 0) { // Auto
|
||||||
#if __cpp_lib_chrono >= 201907L
|
#if __cpp_lib_chrono >= 201907L
|
||||||
const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb();
|
const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb();
|
||||||
|
try {
|
||||||
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;
|
||||||
|
} 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
|
#else
|
||||||
location_name = Common::TimeZone::FindSystemTimeZone();
|
location_name = Common::TimeZone::FindSystemTimeZone();
|
||||||
#endif
|
#endif
|
||||||
|
|
Reference in New Issue