diff options
| author |  bunnei | 2019-09-29 21:44:10 -0400 |
|---|---|---|
| committer |  GitHub | 2019-09-29 21:44:10 -0400 |
| commit | 28538bba9c5eb6b07564e9b427194b360e633135 (patch) | |
| tree | 739b688d88e057c9723e6f44b8bd7c0eb4e3fa01 /src | |
| parent | Merge pull request #2909 from MysticExile/fmt-2 (diff) | |
| parent | arm_dynarmic: Check if jit is nullptr when preparing reschedule (diff) | |
| download | yuzu-28538bba9c5eb6b07564e9b427194b360e633135.tar.gz yuzu-28538bba9c5eb6b07564e9b427194b360e633135.tar.xz yuzu-28538bba9c5eb6b07564e9b427194b360e633135.zip | |
Merge pull request #2574 from DarkLordZach/dynarmic-jit-nullptr
arm_dynarmic: Check if jit is nullptr when preparing reschedule
Diffstat (limited to '')
| -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) { | |||
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | void ARM_Dynarmic::PrepareReschedule() { | 250 | void ARM_Dynarmic::PrepareReschedule() { |
| 251 | if (jit == nullptr) | ||
| 252 | return; | ||
| 253 | |||
| 251 | jit->HaltExecution(); | 254 | jit->HaltExecution(); |
| 252 | } | 255 | } |
| 253 | 256 | ||