summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorzackhow <zackhow@gmail.com>2018-11-03 00:01:51 -0400
committerzackhow <zackhow@gmail.com>2018-11-03 00:01:51 -0400
commit50da2840607eb0c101426d7207fd41c85ed9fa2a (patch)
tree5a8466ba277b8745e75f880a7008734aab468a0d /Source/Android/app/src/main/java
parent22ddd11573fd8d3e43a879804e7a64e50928435d (diff)
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
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java3
1 files changed, 2 insertions, 1 deletions
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();
}