From 77fbe67dbeb9f8703af409ae506d6f1da948b29a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 20 Dec 2013 12:47:39 -0500
Subject: [PATCH] [Android] Fix a bug in the DetectCoreDirectoryFragment.

Would crash if an unsupported file was tapped twice because it would set the inFileBrowser boolean to false, thus leading to the attempt to launch said unsupported file. Fixes this.

Also made it display a brief toast if no cores support the extension of the file.
---
 android/phoenix/res/values/strings.xml           |  1 +
 .../dirfragment/DetectCoreDirectoryFragment.java | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml
index 30a6676b82..fcb048e105 100644
--- a/android/phoenix/res/values/strings.xml
+++ b/android/phoenix/res/values/strings.xml
@@ -54,6 +54,7 @@
 
     <!-- Core Autodetect strings -->
     <string name="multiple_cores_detected">Multiple cores detected</string>
+    <string name="no_cores_detected">No supported cores detected</string>
 
     <!-- Main Menu Class -->
     <string name="welcome_to_retroarch">Welcome to RetroArch</string>
diff --git a/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java b/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java
index 3a34657054..4cc5d1d4ee 100644
--- a/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java
+++ b/android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java
@@ -19,6 +19,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.retroarch.R;
 import com.retroarch.browser.FileWrapper;
@@ -186,14 +187,22 @@ public final class DetectCoreDirectoryFragment extends DirectoryFragment
 					}
 				}
 
-				// If only one core is supported, 
-				if (supportedCores.size() == 1)
+				// Display a toast if no cores are detected.
+				if (supportedCores.isEmpty())
+				{
+					Toast.makeText(getActivity(), R.string.no_cores_detected, Toast.LENGTH_SHORT).show();
+				}
+				// If only one core is supported, launch the content directly.
+				else if (supportedCores.size() == 1)
 				{
 					launchCore(selected.getPath(), supportedCores.get(0).getUnderlyingFile().getPath());
 				}
 				// Otherwise build the list for the user to choose from.
 				else if (supportedCores.size() > 1)
 				{
+					// Not in the file browser any more.
+					inFileBrowser = false;
+
 					// Modify the title to notify of multiple cores.
 					getDialog().setTitle(R.string.multiple_cores_detected);
 
@@ -212,9 +221,6 @@ public final class DetectCoreDirectoryFragment extends DirectoryFragment
 			{
 				launchCore(chosenFile.getPath(), DetectCoreDirectoryFragment.this.supportedCorePaths.get(position));
 			}
-
-			// Not in the file browser any more.
-			inFileBrowser = false;
 		}
 	};