The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 22:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: Fix race condition with writing files before setting User path

Browse Source
This commit is contained in:
JosJuice 2017-12-24 16:44:43 +01:00
parent 3262314435
commit 152f7fa35c
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
View File

@ -13,22 +13,20 @@ public final class StartupHandler
{ {
public static boolean HandleInit(FragmentActivity parent) public static boolean HandleInit(FragmentActivity parent)
{ {
NativeLibrary.SetUserDirectory(""); // Auto-Detect String user_dir = "";
String start_file = "";
if (PermissionsHandler.checkWritePermission(parent)) {
DirectoryInitializationService.startService(parent);
}
Intent intent = parent.getIntent();
Bundle extras = intent.getExtras();
Bundle extras = parent.getIntent().getExtras();
if (extras != null) if (extras != null)
{ {
String user_dir = extras.getString("UserDir"); user_dir = extras.getString("UserDir");
String start_file = extras.getString("AutoStartFile"); start_file = extras.getString("AutoStartFile");
}
if (!TextUtils.isEmpty(user_dir)) NativeLibrary.SetUserDirectory(user_dir); // Uses default path if user_dir equals ""
NativeLibrary.SetUserDirectory(user_dir);
if (PermissionsHandler.checkWritePermission(parent))
DirectoryInitializationService.startService(parent);
if (!TextUtils.isEmpty(start_file)) if (!TextUtils.isEmpty(start_file))
{ {
@ -39,7 +37,7 @@ public final class StartupHandler
parent.finish(); parent.finish();
return false; return false;
} }
}
return false; return false;
} }
} }