summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2018-10-29 02:34:59 +0100
committerGitHub <noreply@github.com>2018-10-29 02:34:59 +0100
commit2b905eb06a806bc654281910d92693e2dcb6f201 (patch)
tree348347d5626f3d434bfc7ed4d52aec5b2f640247 /Source/Android/app/src/main/java
parentdd0122944a7faa2a665acd9f4c1c3981a38a32a7 (diff)
parent1b3db3d8c16b58c135093c5777be2df03d330552 (diff)
Merge pull request #7529 from zackhow/atv-exit
Android: fix ATV not exiting
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index fb46492674..1c9ac12953 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -572,6 +572,7 @@ public final class EmulationActivity extends AppCompatActivity
if (TvUtil.isLeanback(getApplicationContext()))
toggleMenu(); // Hide the menu (it will be showing since we just clicked it)
mEmulationFragment.stopEmulation();
+ finish();
return;
}
}