diff options
| author | Kim Johnsson <kimjohnsson@gmail.com> | 2016-01-05 13:55:30 +0100 |
|---|---|---|
| committer | Kim Johnsson <kimjohnsson@gmail.com> | 2016-01-05 13:55:30 +0100 |
| commit | 204201bcbc38da1e295244cd075dc7868294e2b3 (patch) | |
| tree | 27688de6d19ab544d90c25e4d8c2839c9dc6ffc6 /Source/Android/app/src | |
| parent | 0da8bd0f618de661dc32dcd1425ec6acc3db9faf (diff) | |
StartupHandler.java: Finish main activity if AutoStartFile is specified in intent
Call finish() on parent (main/browser) activity after starting EmulationActivity if AutoStartFile was specified. This makes the experience more streamlined for users who want to start games from an external frontend, since they don't expect to return to the Dolphin main activity after they've played their game.
Diffstat (limited to 'Source/Android/app/src')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java index d59865cb75..c823096858 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java @@ -42,10 +42,11 @@ public final class StartupHandler if (!TextUtils.isEmpty(start_file)) { - // Start the emulation activity and send the ISO passed in. + // Start the emulation activity, send the ISO passed in and finish the main activity Intent emulation_intent = new Intent(parent, EmulationActivity.class); emulation_intent.putExtra("SelectedGame", start_file); parent.startActivity(emulation_intent); + parent.finish(); return false; } } |