Merge pull request #3596 from Sonicadvance1/fix_android_crash

[Android] Fix crash when we don't have access to a folder.

1 files changed, 14 insertions, 9 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
index 8d07b6c101..aea9ce7297 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
@@ -159,20 +159,25 @@ public final class FileAdapter extends RecyclerView.Adapter<FileViewHolder> impl
 	private ArrayList<FileListItem> generateFileList(File directory)
 	{
 		File[] children = directory.listFiles();
-		ArrayList<FileListItem> fileList = new ArrayList<FileListItem>(children.length);
+		mPath = directory.getAbsolutePath();
+		ArrayList<FileListItem> fileList = new ArrayList<FileListItem>(0);
 
-		for (File child : children)
+		if (children != null)
 		{
-			if (!child.isHidden())
+
+			fileList = new ArrayList<FileListItem>(children.length);
+
+			for (File child : children)
 			{
-				FileListItem item = new FileListItem(child);
-				fileList.add(item);
+				if (!child.isHidden())
+				{
+					FileListItem item = new FileListItem(child);
+					fileList.add(item);
+				}
 			}
-		}
-
-		mPath = directory.getAbsolutePath();
 
-		Collections.sort(fileList);
+			Collections.sort(fileList);
+		}
 		return fileList;
 	}