Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #454 from Sonicadvance1/fix-android-crash
[Android] Fix potential crash in Video Settings.
  • Loading branch information
Sonicadvance1 committed Jun 3, 2014
2 parents edf9af0 + 7dc31fb commit b5a12dd
Showing 1 changed file with 13 additions and 8 deletions.
Expand Up @@ -63,24 +63,29 @@ public void onCreate(Bundle savedInstanceState)
//
// Set available post processing shaders
//
File[] shaders = new File(Environment.getExternalStorageDirectory()+ File.separator+"dolphin-emu"+ File.separator+"Shaders").listFiles();

List<CharSequence> shader_names = new ArrayList<CharSequence>();
List<CharSequence> shader_values = new ArrayList<CharSequence>();

// Disabled option
shader_names.add("Disabled");
shader_values.add("");

for (File file : shaders)
File shaders_folder = new File(Environment.getExternalStorageDirectory()+ File.separator+"dolphin-emu"+ File.separator+"Shaders");
if (shaders_folder.exists())
{
if (file.isFile())
File[] shaders = shaders_folder.listFiles();
for (File file : shaders)
{
String filename = file.getName();
if (filename.contains(".glsl"))
if (file.isFile())
{
// Strip the extension and put it in to the list
shader_names.add(filename.substring(0, filename.lastIndexOf('.')));
shader_values.add(filename.substring(0, filename.lastIndexOf('.')));
String filename = file.getName();
if (filename.contains(".glsl"))
{
// Strip the extension and put it in to the list
shader_names.add(filename.substring(0, filename.lastIndexOf('.')));
shader_values.add(filename.substring(0, filename.lastIndexOf('.')));
}
}
}
}
Expand Down

0 comments on commit b5a12dd

Please sign in to comment.