From 6deb38c07d440aeda191a527e5eb13b8c13377c9 Mon Sep 17 00:00:00 2001 From: zevektor Date: Wed, 21 Aug 2013 14:04:43 +0200 Subject: [PATCH 1/2] Checks on load rom from external app changed. --- .../org/retroarch/browser/MainMenuActivity.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java index 7025923bd0..abc10d52a5 100644 --- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java +++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java @@ -37,6 +37,7 @@ public class MainMenuActivity extends PreferenceActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); instance = this; + addPreferencesFromResource(R.xml.prefs); PreferenceManager.setDefaultValues(this, R.xml.prefs, false); this.setVolumeControlStream(AudioManager.STREAM_MUSIC); @@ -85,18 +86,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) { + if (null==savedInstanceState || !savedInstanceState.getBoolean("romexec")) loadRomExternal(startedByIntent.getStringExtra("ROM"), startedByIntent.getStringExtra("LIBRETRO")); - prefs.edit().putInt("loadRomExternal", 1).commit(); - } else{ - prefs.edit().putInt("loadRomExternal", 0).commit(); + else super.onBackPressed(); - } + // return; } + } public static MainMenuActivity getInstance() { @@ -677,6 +678,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) { updateConfigFile(); From 8b0124ba2af2d393b5cf99e3b0527d2f522a89a8 Mon Sep 17 00:00:00 2001 From: zevektor Date: Wed, 21 Aug 2013 14:08:06 +0200 Subject: [PATCH 2/2] Load roms from external app - #3 --- .../phoenix/src/org/retroarch/browser/MainMenuActivity.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java index abc10d52a5..5924298ebe 100644 --- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java +++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java @@ -93,9 +93,7 @@ public class MainMenuActivity extends PreferenceActivity { if (null==savedInstanceState || !savedInstanceState.getBoolean("romexec")) loadRomExternal(startedByIntent.getStringExtra("ROM"), startedByIntent.getStringExtra("LIBRETRO")); - else - super.onBackPressed(); - // return; + else finish(); } }