7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

workaround multithreaded base directory issues

Browse source
This commit is contained in:
qimiko 2024-01-08 23:11:27 -07:00
parent aecd7cc186
commit 6b1164d4a6
No known key found for this signature in database
GPG key ID: D2D404DD810FE0E3
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
loader/src/platform/android/util.cpp
View file

@ -56,10 +56,17 @@ namespace {
} }
} }
// jni breaks over multithreading, so the value is stored to avoid more jni calls
std::string s_savedBaseDir = "";
ghc::filesystem::path getBaseDir() { ghc::filesystem::path getBaseDir() {
JniMethodInfo t;
std::string path = "/storage/emulated/0/Android/data/com.geode.launcher/files"; std::string path = "/storage/emulated/0/Android/data/com.geode.launcher/files";
if (!s_savedBaseDir.empty()) {
return ghc::filesystem::path(s_savedBaseDir);
}
JniMethodInfo t;
if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", "getBaseDirectory", "()Ljava/lang/String;")) { if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", "getBaseDirectory", "()Ljava/lang/String;")) {
jstring str = reinterpret_cast<jstring>(t.env->CallStaticObjectMethod(t.classID, t.methodID)); jstring str = reinterpret_cast<jstring>(t.env->CallStaticObjectMethod(t.classID, t.methodID));
t.env->DeleteLocalRef(t.classID); t.env->DeleteLocalRef(t.classID);
@ -69,6 +76,7 @@ namespace {
clearJNIException(); clearJNIException();
} }
s_savedBaseDir = path;
return ghc::filesystem::path(path); return ghc::filesystem::path(path);
} }
} }