diff options
| author | bunnei <bunneidev@gmail.com> | 2019-09-29 21:44:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 21:44:10 -0400 |
| commit | 28538bba9c5eb6b07564e9b427194b360e633135 (patch) | |
| tree | 739b688d88e057c9723e6f44b8bd7c0eb4e3fa01 /src | |
| parent | 8a2e96de2e2f9075d82b0e5ceea17ab7c0397d8f (diff) | |
| parent | 425cdf946c9596cf81a3bf8b536c936f5a6b6509 (diff) | |
Merge pull request #2574 from DarkLordZach/dynarmic-jit-nullptr
arm_dynarmic: Check if jit is nullptr when preparing reschedule
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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(); } |