summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2019-09-29 21:54:36 -0400
committerGravatar GitHub2019-09-29 21:54:36 -0400
commite11afeb34d7b4493a94c18fd7960df97b7d95156 (patch)
tree29a8a5bf89df0242065d48bad400bf0eb2b3cd4a
parentMerge pull request #2574 from DarkLordZach/dynarmic-jit-nullptr (diff)
parentRevert "arm_dynarmic: Check if jit is nullptr when preparing reschedule" (diff)
downloadyuzu-e11afeb34d7b4493a94c18fd7960df97b7d95156.tar.gz
yuzu-e11afeb34d7b4493a94c18fd7960df97b7d95156.tar.xz
yuzu-e11afeb34d7b4493a94c18fd7960df97b7d95156.zip
Merge pull request #2923 from yuzu-emu/revert-2574-dynarmic-jit-nullptr
Revert "arm_dynarmic: Check if jit is nullptr when preparing reschedule"
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 2a08d4cea..f1506b372 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -248,9 +248,6 @@ void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) {
248} 248}
249 249
250void ARM_Dynarmic::PrepareReschedule() { 250void ARM_Dynarmic::PrepareReschedule() {
251 if (jit == nullptr)
252 return;
253
254 jit->HaltExecution(); 251 jit->HaltExecution();
255} 252}
256 253