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

Add a thorough check for the data folder dilemma

This commit is contained in:
TwistedUmbrella 2015-01-06 19:53:14 -05:00
parent 4c96052d32
commit 8e548811e1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
shell/android/src/com/reicast/emulator/FileBrowser.java
View File

@ -393,14 +393,13 @@ public class FileBrowser extends Fragment {
mCallback.onFolderSelected(game != null ? Uri
.fromFile(game) : Uri.EMPTY);
home_directory = game.getAbsolutePath().substring(0,
game.getAbsolutePath().lastIndexOf(File.separator));
game.getAbsolutePath().lastIndexOf(File.separator)).replace("/data", "");
if (!DataDirectoryBIOS()) {
MainActivity.showToastMessage(getActivity(),
getActivity().getString(R.string.config_data, home_directory),
Toast.LENGTH_LONG);
}
mPrefs.edit().putString("home_directory",
home_directory.replace("/data", "")).commit();
mPrefs.edit().putString("home_directory", home_directory).commit();
JNIdc.config(home_directory.replace("/data", ""));
}
}
@ -492,7 +491,7 @@ public class FileBrowser extends Fragment {
.putString(Config.pref_games,
heading).commit();
} else {
home_directory = heading;
home_directory = heading.replace("/data", "");
mPrefs.edit()
.putString(Config.pref_home,
heading).commit();
@ -532,12 +531,18 @@ public class FileBrowser extends Fragment {
if (!data_directory.exists() || !data_directory.isDirectory()) {
data_directory.mkdirs();
File bios = new File(home_directory, "dc_boot.bin");
boolean success = bios.renameTo(new File(home_directory + "/data", "dc_boot.bin"));
boolean success = bios.renameTo(new File(home_directory, "data/dc_boot.bin"));
File flash = new File(home_directory, "dc_flash.bin");
success = flash.renameTo(new File(home_directory + "/data", "dc_flash.bin"));
success = flash.renameTo(new File(home_directory, "data/dc_flash.bin"));
return success;
} else {
return true;
File bios = new File(home_directory, "data/dc_boot.bin");
File flash = new File(home_directory, "data/dc_flash.bin");
if (bios.exists() && flash.exists()) {
return true;
} else {
return false;
}
}
}
}