diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-12-28 20:45:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 20:45:10 +0100 |
| commit | 257da9980ed0dd1fe363ef81a511a49dd6cd97c1 (patch) | |
| tree | d3aeb263f30bbb17c270ab3debd0196ffe9297f3 /Source/Android/jni/MainAndroid.cpp | |
| parent | 1df69c57507dbeea638eceac1c7410b737f1739c (diff) | |
| parent | b921f6cdefe9b05359a885e790ed860b4eaf256f (diff) | |
Merge pull request #6275 from JosJuice/android-reliable-init
Android: Always run HandleInit logic on app start
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 9fc8781cfa..c6c40da097 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -54,7 +54,6 @@ JavaVM* g_java_vm; namespace { ANativeWindow* s_surf; -std::string s_set_userpath; jclass s_jni_class; jmethodID s_jni_method_alert; @@ -677,9 +676,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirec JNIEnv* env, jobject obj, jstring jDirectory) { std::lock_guard<std::mutex> guard(s_host_identity_lock); - std::string directory = GetJString(env, jDirectory); - s_set_userpath = directory; - UICommon::SetUserDirectory(directory); + UICommon::SetUserDirectory(GetJString(env, jDirectory)); } JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDirectory(JNIEnv* env, @@ -778,7 +775,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* RegisterMsgAlertHandler(&MsgAlert); std::unique_lock<std::mutex> guard(s_host_identity_lock); - UICommon::SetUserDirectory(s_set_userpath); UICommon::Init(); WiimoteReal::InitAdapterClass(); |