diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/common/settings.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/arm_interface.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 742685fb0..6184f3eb6 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml | |||
| @@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-3.0-or-later | |||
| 22 | android:label="@string/app_name_suffixed" | 22 | android:label="@string/app_name_suffixed" |
| 23 | android:icon="@drawable/ic_launcher" | 23 | android:icon="@drawable/ic_launcher" |
| 24 | android:allowBackup="true" | 24 | android:allowBackup="true" |
| 25 | android:hasFragileUserData="true" | 25 | android:hasFragileUserData="false" |
| 26 | android:supportsRtl="true" | 26 | android:supportsRtl="true" |
| 27 | android:isGame="true" | 27 | android:isGame="true" |
| 28 | android:localeConfig="@xml/locales_config" | 28 | android:localeConfig="@xml/locales_config" |
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6cbbea1b2..5972480e5 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -27,8 +27,8 @@ std::string GetTimeZoneString() { | |||
| 27 | std::string location_name; | 27 | std::string location_name; |
| 28 | if (time_zone_index == 0) { // Auto | 28 | if (time_zone_index == 0) { // Auto |
| 29 | #if __cpp_lib_chrono >= 201907L | 29 | #if __cpp_lib_chrono >= 201907L |
| 30 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); | ||
| 31 | try { | 30 | try { |
| 31 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); | ||
| 32 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); | 32 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); |
| 33 | std::string_view current_zone_name = current_zone->name(); | 33 | std::string_view current_zone_name = current_zone->name(); |
| 34 | location_name = current_zone_name; | 34 | 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() { | |||
| 185 | // Notify the debugger and go to sleep if a breakpoint was hit, | 185 | // Notify the debugger and go to sleep if a breakpoint was hit, |
| 186 | // or if the thread is unable to continue for any reason. | 186 | // or if the thread is unable to continue for any reason. |
| 187 | if (True(hr & HaltReason::InstructionBreakpoint) || True(hr & HaltReason::PrefetchAbort)) { | 187 | if (True(hr & HaltReason::InstructionBreakpoint) || True(hr & HaltReason::PrefetchAbort)) { |
| 188 | if (!True(hr & HaltReason::InstructionBreakpoint)) { | 188 | if (!True(hr & HaltReason::PrefetchAbort)) { |
| 189 | RewindBreakpointInstruction(); | 189 | RewindBreakpointInstruction(); |
| 190 | } | 190 | } |
| 191 | if (system.DebuggerEnabled()) { | 191 | if (system.DebuggerEnabled()) { |