From 2dcc133cabbe3a693ccbad7b27c4c8d5588a3ff4 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Fri, 16 Aug 2013 12:25:34 +0200
Subject: [PATCH] Wait for asset thread when selecting overlay and/or shader.

---
 android/phoenix/src/org/retroarch/browser/OverlayActivity.java | 1 +
 android/phoenix/src/org/retroarch/browser/ShaderActivity.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/phoenix/src/org/retroarch/browser/OverlayActivity.java b/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
index 38981f6b87..b92b190a14 100644
--- a/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
@@ -7,6 +7,7 @@ import android.os.Bundle;
 public class OverlayActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		MainMenuActivity.waitAssetThread();
 		File overlayDir = new File(getBaseContext().getApplicationInfo().dataDir, "overlays");
 		if (overlayDir.exists())
 			super.setStartDirectory(overlayDir.getAbsolutePath());
diff --git a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
index 3fb705de94..707363b19e 100644
--- a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
@@ -7,6 +7,7 @@ import android.os.Bundle;
 public class ShaderActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		MainMenuActivity.waitAssetThread();
 		File shaderDir = new File(getBaseContext().getApplicationInfo().dataDir, "shaders_glsl");
 		if (shaderDir.exists())
 			super.setStartDirectory(shaderDir.getAbsolutePath());