diff options
| author | JosJuice <josjuice@gmail.com> | 2018-10-05 15:45:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 15:45:36 +0200 |
| commit | 683eef304424780da9becb4351e06eef97e03ccd (patch) | |
| tree | ceffda9d979b6a10f52be33cd4a1efbc487a3afb /Source/Android/jni/MainAndroid.cpp | |
| parent | 4ebf3f31896372613f958a07861e9608753fb589 (diff) | |
| parent | 1311f84706041d313abb4dbf2e0ca50893399e80 (diff) | |
Merge pull request #7413 from zackhow/launcher-crash
Android: Run Directory Initialization as a thread instead of service
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index a160786063..089d0b776d 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -246,8 +246,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadStateAs( jobject obj, jstring path); JNIEXPORT void JNICALL -Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_CreateUserDirectories( - JNIEnv* env, jobject obj); +Java_org_dolphinemu_dolphinemu_utils_DirectoryInitialization_CreateUserDirectories(JNIEnv* env, + jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory( JNIEnv* env, jobject obj, jstring jDirectory); JNIEXPORT jstring JNICALL @@ -457,8 +457,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadStateAs( State::LoadAs(GetJString(env, path)); } -JNIEXPORT void JNICALL -Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_SetSysDirectory( +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_utils_DirectoryInitialization_SetSysDirectory( JNIEnv* env, jobject obj, jstring jPath) { const std::string path = GetJString(env, jPath); @@ -466,8 +465,8 @@ Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_SetSysDir } JNIEXPORT void JNICALL -Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_CreateUserDirectories( - JNIEnv* env, jobject obj) +Java_org_dolphinemu_dolphinemu_utils_DirectoryInitialization_CreateUserDirectories(JNIEnv* env, + jobject obj) { UICommon::CreateDirectories(); } |