Merge pull request #7540 from zackhow/land

Android: don't try to pause emulation when not running
2018-11-03 05:22:52 +01:00 · 2018-11-03 05:22:52 +01:00 · 0d00e6225b
parent 650961687a 50da284060
commit 0d00e6225b
1 changed files with 2 additions and 1 deletions
--- 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();
  }