From 70431dc86f4746c7b2a284f41a1e2ca983b76a5c Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 28 Mar 2020 20:39:25 +0100 Subject: [PATCH] Android: don't try to pause emulation when not running Forcing landscape at emulation start revealed a bug where if the activity was recreated before emulation started then it would get stuck in a paused state. Original commit by zackhow for Dolphin-emu. --- .../java/org/citra/citra_emu/fragments/EmulationFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java index 78dc87990..b48fcf1a2 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java @@ -127,7 +127,8 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C directoryStateReceiver = null; } - mEmulationState.pause(); + if (mEmulationState.isRunning()) + mEmulationState.pause(); super.onPause(); }