From 07434e3a654d4fc749ff8d53b20c864afbf6bb83 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 5 Feb 2016 22:03:33 -0600
Subject: [Android] Fix crash when we don't have access to a folder.

---
 .../dolphinemu/adapters/FileAdapter.java           | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'Source/Android/app/src/main/java')

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;
 	}
 
-- 
cgit v1.2.3