summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-12-28 13:34:49 +0100
committerJosJuice <josjuice@gmail.com>2017-12-28 13:34:49 +0100
commitb921f6cdefe9b05359a885e790ed860b4eaf256f (patch)
treed3aeb263f30bbb17c270ab3debd0196ffe9297f3 /Source/Android/jni/MainAndroid.cpp
parent3e6e66b0d9a1f35dd3032a6d7728123d9c270c44 (diff)
MainAndroid: Don't set User directory redundantly
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp6
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();