diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java index 35fe1c56b9..7025923bd0 100644 --- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java +++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java @@ -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() {