mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-25 09:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style nits.

Browse Source
This commit is contained in:
Themaister 2013-08-21 18:57:27 +02:00
parent 54b27bf587
commit 6ab81b648e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,12 +90,13 @@ public class MainMenuActivity extends PreferenceActivity {
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 (null==savedInstanceState || !savedInstanceState.getBoolean("romexec")) if (null == savedInstanceState
|| !savedInstanceState.getBoolean("romexec"))
loadRomExternal(startedByIntent.getStringExtra("ROM"), loadRomExternal(startedByIntent.getStringExtra("ROM"),
startedByIntent.getStringExtra("LIBRETRO")); startedByIntent.getStringExtra("LIBRETRO"));
else finish(); else
finish();
} }
} }
public static MainMenuActivity getInstance() { public static MainMenuActivity getInstance() {
@ -683,7 +684,6 @@ public class MainMenuActivity extends PreferenceActivity {
} }
private void loadRomExternal(String rom, String core) { private void loadRomExternal(String rom, String core) {
updateConfigFile(); updateConfigFile();
Intent myIntent = new Intent(this, RetroActivity.class); Intent myIntent = new Intent(this, RetroActivity.class);
String current_ime = Settings.Secure.getString(getContentResolver(), String current_ime = Settings.Secure.getString(getContentResolver(),
@ -692,9 +692,8 @@ public class MainMenuActivity extends PreferenceActivity {
.show(); .show();
myIntent.putExtra("ROM", rom); myIntent.putExtra("ROM", rom);
myIntent.putExtra("LIBRETRO", core); myIntent.putExtra("LIBRETRO", core);
myIntent.putExtra("CONFIGFILE", MainMenuActivity.getDefaultConfigPath()); myIntent.putExtra("CONFIGFILE", getDefaultConfigPath());
myIntent.putExtra("IME", current_ime); myIntent.putExtra("IME", current_ime);
startActivity(myIntent); startActivity(myIntent);
} }
} }