Merge pull request #7540 from zackhow/land

Android: don't try to pause emulation when not running
dolphin-emu · Nov 3, 2018 · 0d00e62 · 0d00e62
2 parents 6509616 + 50da284
commit 0d00e62
Showing 1 changed file with 2 additions and 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
@@ -146,7 +146,8 @@ public void onPause()
       directoryStateReceiver = null;
     }
 
-    mEmulationState.pause();
+    if (mEmulationState.isRunning())
+      mEmulationState.pause();
     super.onPause();
   }