From 204201bcbc38da1e295244cd075dc7868294e2b3 Mon Sep 17 00:00:00 2001 From: Kim Johnsson Date: Tue, 5 Jan 2016 13:55:30 +0100 Subject: [PATCH] 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. --- .../java/org/dolphinemu/dolphinemu/utils/StartupHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } }