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

Merge pull request #283 from zevektor/master 

Load roms from external app - #3
This commit is contained in:
Hans-Kristian Arntzen 2013-08-21 09:46:56 -07:00
parent 713afdb901 8b0124ba2a
commit 54b27bf587
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ public class MainMenuActivity extends PreferenceActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
instance = this; instance = this;
addPreferencesFromResource(R.xml.prefs); addPreferencesFromResource(R.xml.prefs);
PreferenceManager.setDefaultValues(this, R.xml.prefs, false); PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
this.setVolumeControlStream(AudioManager.STREAM_MUSIC); this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
@ -85,18 +86,16 @@ public class MainMenuActivity extends PreferenceActivity {
libretro_name = "No core"; libretro_name = "No core";
setCoreTitle("No core"); setCoreTitle("No core");
} }
Intent startedByIntent = getIntent(); Intent startedByIntent = getIntent();
if (null != startedByIntent.getStringExtra("ROM") if (null != startedByIntent.getStringExtra("ROM")
&& null != startedByIntent.getStringExtra("LIBRETRO")) { && null != startedByIntent.getStringExtra("LIBRETRO")) {
if (prefs.getInt("loadRomExternal", 0) == 0) { if (null==savedInstanceState || !savedInstanceState.getBoolean("romexec"))
loadRomExternal(startedByIntent.getStringExtra("ROM"), loadRomExternal(startedByIntent.getStringExtra("ROM"),
startedByIntent.getStringExtra("LIBRETRO")); startedByIntent.getStringExtra("LIBRETRO"));
prefs.edit().putInt("loadRomExternal", 1).commit(); else finish();
} else{
prefs.edit().putInt("loadRomExternal", 0).commit();
super.onBackPressed();
}
} }
} }
public static MainMenuActivity getInstance() { public static MainMenuActivity getInstance() {
@ -677,6 +676,12 @@ public class MainMenuActivity extends PreferenceActivity {
} }
} }
@Override
protected void onSaveInstanceState(Bundle data) {
super.onSaveInstanceState(data);
data.putBoolean("romexec", true);
}
private void loadRomExternal(String rom, String core) { private void loadRomExternal(String rom, String core) {
updateConfigFile(); updateConfigFile();