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

Merge pull request #401 from lioncash/fix-filebrowser 

Fix case where the file list would cause a crash.
This commit is contained in:
Lioncash 2014-03-08 17:17:39 -05:00
parent 27ee791d71 35cd0e1d38
commit d2524dea99
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,14 +166,14 @@ public class FileBrowser extends Fragment {
}
}
class LocateGames extends AsyncTask<String, Integer, List<File>> {
private final class LocateGames extends AsyncTask<String, Integer, List<File>> {
@Override
protected List<File> doInBackground(String... paths) {
File storage = new File(paths[0]);
// array of valid image file extensions
String[] mediaTypes = getResources().getStringArray(R.array.images);
String[] mediaTypes = parentActivity.getResources().getStringArray(R.array.images);
FilenameFilter[] filter = new FilenameFilter[mediaTypes.length];
int i = 0;
@ -201,23 +201,20 @@ public class FileBrowser extends Fragment {
@Override
protected void onPostExecute(List<File> games) {
final LinearLayout list = (LinearLayout) parentActivity
.findViewById(R.id.game_list);
final LinearLayout list = (LinearLayout) parentActivity.findViewById(R.id.game_list);
list.removeAllViews();
String heading = getString(R.string.games_listing);
String heading = parentActivity.getString(R.string.games_listing);
createListHeader(heading, list, true);
if (games != null && !games.isEmpty()) {
for (final File game : games) {
createListItem(list, game);
}
} else {
Toast.makeText(parentActivity, R.string.config_game,
Toast.LENGTH_LONG).show();
Toast.makeText(parentActivity, R.string.config_game, Toast.LENGTH_LONG).show();
}
list.invalidate();
}
}
private static final class DirSort implements Comparator<File> {