mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #282 from zevektor/master

Browse Source 
Load external rom - #2
This commit is contained in:
Hans-Kristian Arntzen 2013-08-21 04:29:48 -07:00
commit 713afdb901
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
View File

@ -36,13 +36,6 @@ public class MainMenuActivity extends PreferenceActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Intent startedByIntent = getIntent();
if (null != startedByIntent.getStringExtra("ROM")
&& null != startedByIntent.getStringExtra("LIBRETRO")) {
loadRomExternal(startedByIntent.getStringExtra("ROM"),
startedByIntent.getStringExtra("LIBRETRO"));
return;
}
instance = this;
addPreferencesFromResource(R.xml.prefs);
PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
@ -92,6 +85,18 @@ public class MainMenuActivity extends PreferenceActivity {
libretro_name = "No core";
setCoreTitle("No core");
}
Intent startedByIntent = getIntent();
if (null != startedByIntent.getStringExtra("ROM")
&& null != startedByIntent.getStringExtra("LIBRETRO")) {
if (prefs.getInt("loadRomExternal", 0) == 0) {
loadRomExternal(startedByIntent.getStringExtra("ROM"),
startedByIntent.getStringExtra("LIBRETRO"));
prefs.edit().putInt("loadRomExternal", 1).commit();
} else{
prefs.edit().putInt("loadRomExternal", 0).commit();
super.onBackPressed();
}
}
}
public static MainMenuActivity getInstance() {