CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 02:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #370 from lioncash/master

Browse Source 
[Android] Do checking for a valid core name in ModuleWrapper.
This commit is contained in:
Squarepusher 2013-11-02 19:17:55 -07:00
commit c4268a1079
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/phoenix/src/com/retroarch/browser/ModuleWrapper.java
View File

@ -37,8 +37,11 @@ public final class ModuleWrapper implements IconAdapterItem, Comparable<ModuleWr
// Attempt to get the core's info file.
// Basically this is dataDir/info/[core name].info
// So first, since the core name will contain platform specific strings at the end of name, we trim this.
final String coreName = file.getName().substring(0, file.getName().lastIndexOf("_android.so"));
// So first, since the core name will have a platform-specific identifier at the end of its name, we trim this.
// If it turns out we have an invalid core name, simply assign the core name as the full name of the file.
final boolean isValidCoreName = (file.getName().lastIndexOf("_android.so") != -1);
final String coreName = (isValidCoreName) ? file.getName().substring(0, file.getName().lastIndexOf("_android.so"))
: file.getName();
// Now get the directory where all of the info files are kept (dataDir/info)
final String infoFileDir = context.getApplicationInfo().dataDir + File.separator + "info";