ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3449 from freelancer42/android_finish_main_activity_after_autostartfile 

StartupHandler.java: Finish main activity if AutoStartFile is specified in intent
This commit is contained in:
Pierre Bourdon 2016-01-07 00:50:47 +01:00
parent 89bb4b1288 204201bcbc
commit dd1192b709
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
View File

@ -42,10 +42,11 @@ public final class StartupHandler
if (!TextUtils.isEmpty(start_file)) 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); Intent emulation_intent = new Intent(parent, EmulationActivity.class);
emulation_intent.putExtra("SelectedGame", start_file); emulation_intent.putExtra("SelectedGame", start_file);
parent.startActivity(emulation_intent); parent.startActivity(emulation_intent);
parent.finish();
return false; return false;
} }
} }