diff options
| -rw-r--r-- | src/common/settings.cpp | 5 | ||||
| -rw-r--r-- | src/core/arm/arm_interface.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
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() { std::string location_name; if (time_zone_index == 0) { // Auto -#if __cpp_lib_chrono >= 201907L && !defined(_MSC_VER) - // 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(); +#if __cpp_lib_chrono >= 201907L 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(); std::string_view current_zone_name = current_zone->name(); location_name = current_zone_name; diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index beaea64b3..aa0eb9791 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -185,7 +185,7 @@ void ARM_Interface::Run() { // Notify the debugger and go to sleep if a breakpoint was hit, // or if the thread is unable to continue for any reason. if (True(hr & HaltReason::InstructionBreakpoint) || True(hr & HaltReason::PrefetchAbort)) { - if (!True(hr & HaltReason::InstructionBreakpoint)) { + if (!True(hr & HaltReason::PrefetchAbort)) { RewindBreakpointInstruction(); } if (system.DebuggerEnabled()) { |