diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-11-03 05:22:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 05:22:52 +0100 |
| commit | 0d00e6225b6c2774293e6abb6f73cc8c9932b5e5 (patch) | |
| tree | a506277712e57e9dec428be4978aeea62c897037 /Source/Android/app/src/main/java | |
| parent | 650961687ac08613fbac29ba9e41c2e09afca1ee (diff) | |
| parent | 50da2840607eb0c101426d7207fd41c85ed9fa2a (diff) | |
Merge pull request #7540 from zackhow/land
Android: don't try to pause emulation when not running
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java | 3 |
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(); } |