summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormerry <git@mary.rs>2022-04-13 21:40:12 +0200
committermerry <git@mary.rs>2022-04-13 21:40:12 +0200
commitba08f63ec4504455e192a3037ecedf32f6f5fdd0 (patch)
treef24d90c13e647802316d3d51662f1aa66aa82665
parentMerge pull request #8165 from bunnei/ensure-session-port-cleanup (diff)
downloadyuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.tar
yuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.tar.gz
yuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.tar.bz2
yuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.tar.lz
yuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.tar.xz
yuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.tar.zst
yuzu-ba08f63ec4504455e192a3037ecedf32f6f5fdd0.zip
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp2
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index ab3210d84..6f3d53dad 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -232,7 +232,7 @@ void ARM_Dynarmic_32::Run() {
if (Has(hr, svc_call)) {
Kernel::Svc::Call(system, svc_swi);
}
- if (Has(hr, break_loop)) {
+ if (Has(hr, break_loop) || !uses_wall_clock) {
break;
}
}
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index 68822a1fc..1fcb2b891 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -293,7 +293,7 @@ void ARM_Dynarmic_64::Run() {
if (Has(hr, svc_call)) {
Kernel::Svc::Call(system, svc_swi);
}
- if (Has(hr, break_loop)) {
+ if (Has(hr, break_loop) || !uses_wall_clock) {
break;
}
}