diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-07 00:50:47 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-07 00:50:47 +0100 |
| commit | dd1192b7092a005ba0ed2f588c0654d29043b33a (patch) | |
| tree | 6cb3e78433932ce497bc8f24fa61e4ebfbb5cef5 /Source/Android/app/src/main/java | |
| parent | 89bb4b1288af85b405adaa344870375a35d3bdff (diff) | |
| parent | 204201bcbc38da1e295244cd075dc7868294e2b3 (diff) | |
Merge pull request #3449 from freelancer42/android_finish_main_activity_after_autostartfile
StartupHandler.java: Finish main activity if AutoStartFile is specified in intent
Diffstat (limited to 'Source/Android/app/src/main/java')
| -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; } } |