From 50da2840607eb0c101426d7207fd41c85ed9fa2a Mon Sep 17 00:00:00 2001 From: zackhow Date: Sat, 3 Nov 2018 00:01:51 -0400 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 --- .../org/dolphinemu/dolphinemu/fragments/EmulationFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java index e4628e2c4a..38187f881d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java @@ -146,7 +146,8 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C directoryStateReceiver = null; } - mEmulationState.pause(); + if (mEmulationState.isRunning()) + mEmulationState.pause(); super.onPause(); }