Merge pull request #12110 from JosJuice/android-dir-init-toast

Android: Move DirectoryInitialization toast to UI thread
dolphin-emu · Aug 17, 2023 · fc7ef66 · fc7ef66
2 parents a087920 + 4b1b588
commit fc7ef66
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java b/...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
@@ -14,6 +14,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.preference.PreferenceManager;
@@ -73,8 +74,12 @@ private static void init(Context context)
 
     if (!setDolphinUserDirectory(context))
     {
-      Toast.makeText(context, R.string.external_storage_not_mounted, Toast.LENGTH_LONG).show();
-      System.exit(1);
+      ContextCompat.getMainExecutor(context).execute(() ->
+      {
+        Toast.makeText(context, R.string.external_storage_not_mounted, Toast.LENGTH_LONG).show();
+        System.exit(1);
+      });
+      return;
     }
 
     extractSysDirectory(context);