From 77b7f94aff5128f744cc54bf760daeed517ec074 Mon Sep 17 00:00:00 2001 From: yuzubot Date: Sun, 22 Sep 2019 20:40:50 +0000 Subject: [PATCH] "Merge PR 2574" --- src/core/arm/dynarmic/arm_dynarmic.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index f1506b372..2a08d4cea 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -248,6 +248,9 @@ void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) { } void ARM_Dynarmic::PrepareReschedule() { + if (jit == nullptr) + return; + jit->HaltExecution(); }