CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-01 15:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #433 from lioncash/master

Browse Source 
[Android] Fix a bug in the DetectCoreDirectoryFragment.
This commit is contained in:
Twinaphex 2013-12-20 10:09:17 -08:00
commit 375d36152a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/phoenix/res/values/strings.xml
View File

@ -54,6 +54,7 @@
<!-- Core Autodetect strings --> <!-- Core Autodetect strings -->
<string name="multiple_cores_detected">Multiple cores detected</string> <string name="multiple_cores_detected">Multiple cores detected</string>
<string name="no_cores_detected">No supported cores detected</string>
<!-- Main Menu Class --> <!-- Main Menu Class -->
<string name="welcome_to_retroarch">Welcome to RetroArch</string> <string name="welcome_to_retroarch">Welcome to RetroArch</string>

16
android/phoenix/src/com/retroarch/browser/dirfragment/DetectCoreDirectoryFragment.java
View File

@ -19,6 +19,7 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.retroarch.R; import com.retroarch.R;
import com.retroarch.browser.FileWrapper; import com.retroarch.browser.FileWrapper;
@ -186,14 +187,22 @@ public final class DetectCoreDirectoryFragment extends DirectoryFragment
} }
} }
// If only one core is supported, // Display a toast if no cores are detected.
if (supportedCores.size() == 1) 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()); launchCore(selected.getPath(), supportedCores.get(0).getUnderlyingFile().getPath());
} }
// Otherwise build the list for the user to choose from. // Otherwise build the list for the user to choose from.
else if (supportedCores.size() > 1) else if (supportedCores.size() > 1)
{ {
// Not in the file browser any more.
inFileBrowser = false;
// Modify the title to notify of multiple cores. // Modify the title to notify of multiple cores.
getDialog().setTitle(R.string.multiple_cores_detected); 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)); launchCore(chosenFile.getPath(), DetectCoreDirectoryFragment.this.supportedCorePaths.get(position));
} }
// Not in the file browser any more.
inFileBrowser = false;
} }
}; };