summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2023-08-15 13:57:10 +0200
committerJosJuice <josjuice@gmail.com>2023-08-15 14:03:08 +0200
commit4b1b5881b09f358eb9c9cf2310d8803244de46e7 (patch)
tree42c531446b7995c6326479c6d8f2a9d21d5f0b4d /Source/Android/app/src/main/java
parent54d3a226f342318d419c03a5b2b57bca5f42c9dd (diff)
Android: Move DirectoryInitialization toast to UI thread
You're not allowed to just show toasts on any thread you want.
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
index 15d226afd4..1d7342372f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
@@ -14,6 +14,7 @@ import android.widget.Toast;
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 @@ public final class DirectoryInitialization
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);