Merge pull request #1354 from reicast/lk/abandoned
Android: 99 problems and a BIOS ain't one.
This commit is contained in:
commit
7e8f558c19
|
@ -270,7 +270,6 @@ public class MainActivity extends AppCompatActivity implements
|
||||||
public void onMainBrowseSelected(String path, boolean games, String query) {
|
public void onMainBrowseSelected(String path, boolean games, String query) {
|
||||||
FileBrowser firstFragment = new FileBrowser();
|
FileBrowser firstFragment = new FileBrowser();
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
// specify ImgBrowse option. true = images, false = folders only
|
|
||||||
args.putString("browse_entry", path);
|
args.putString("browse_entry", path);
|
||||||
// specify a path for selecting folder options
|
// specify a path for selecting folder options
|
||||||
args.putBoolean("games_entry", games);
|
args.putBoolean("games_entry", games);
|
||||||
|
@ -326,7 +325,7 @@ public class MainActivity extends AppCompatActivity implements
|
||||||
boolean readyToQuit = true;
|
boolean readyToQuit = true;
|
||||||
if (fragment.getArguments() != null) {
|
if (fragment.getArguments() != null) {
|
||||||
readyToQuit = fragment.getArguments().getBoolean(
|
readyToQuit = fragment.getArguments().getBoolean(
|
||||||
"ImgBrowse", true);
|
"games_entry", true);
|
||||||
}
|
}
|
||||||
if (readyToQuit) {
|
if (readyToQuit) {
|
||||||
MainActivity.this.finish();
|
MainActivity.this.finish();
|
||||||
|
@ -345,7 +344,7 @@ public class MainActivity extends AppCompatActivity implements
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launchMainFragment() {
|
private void launchMainFragment() {
|
||||||
onMainBrowseSelected(null, false, null);
|
onMainBrowseSelected(null, true, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue