From 4e07206c98679b3c7e23514a716dc87cee3f9816 Mon Sep 17 00:00:00 2001
From: EXL <exlmotodev@gmail.com>
Date: Fri, 23 Jun 2017 09:58:36 +0700
Subject: [PATCH] Fix crash in FPicker on Android OS >= 7.0

Drop always 'false' condition
---
 src/in/celest/xash3d/FPicker.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index 7d15ca47..ba8ea884 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -78,15 +78,16 @@ public class FPicker extends Activity {
 		{
 			File[] dirs = folder.listFiles();
 			List<Item> dir = new ArrayList<Item>();
-			
+
 			while( dirs == null )
 			{
-				folder = new File(folder.getParent());
-				if( folder == null )
-					return dir;
+				try {
+					folder = new File(folder.getParent());
+				} catch (NullPointerException e) {
+					folder = new File(Environment.getExternalStorageDirectory().toString());
+				}
 				dirs = folder.listFiles();
 			}
-		
 
 			for(File ff: dirs)
 			{