From bc3c0401137ad4ced267354c7658efb0f591f4e1 Mon Sep 17 00:00:00 2001 From: yuzubot Date: Wed, 25 Sep 2019 12:01:26 +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(); }