mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for asset thread when selecting overlay and/or shader.

Browse Source
This commit is contained in:
Themaister 2013-08-16 12:25:34 +02:00
parent 758dc7e196
commit 2dcc133cab
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/phoenix/src/org/retroarch/browser/OverlayActivity.java
View File

@ -7,6 +7,7 @@ import android.os.Bundle;
public class OverlayActivity extends DirectoryActivity { public class OverlayActivity extends DirectoryActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
MainMenuActivity.waitAssetThread();
File overlayDir = new File(getBaseContext().getApplicationInfo().dataDir, "overlays"); File overlayDir = new File(getBaseContext().getApplicationInfo().dataDir, "overlays");
if (overlayDir.exists()) if (overlayDir.exists())
super.setStartDirectory(overlayDir.getAbsolutePath()); super.setStartDirectory(overlayDir.getAbsolutePath());

1
android/phoenix/src/org/retroarch/browser/ShaderActivity.java
View File

@ -7,6 +7,7 @@ import android.os.Bundle;
public class ShaderActivity extends DirectoryActivity { public class ShaderActivity extends DirectoryActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
MainMenuActivity.waitAssetThread();
File shaderDir = new File(getBaseContext().getApplicationInfo().dataDir, "shaders_glsl"); File shaderDir = new File(getBaseContext().getApplicationInfo().dataDir, "shaders_glsl");
if (shaderDir.exists()) if (shaderDir.exists())
super.setStartDirectory(shaderDir.getAbsolutePath()); super.setStartDirectory(shaderDir.getAbsolutePath());