TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 09:07:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix check

Browse Source
This commit is contained in:
khanhduytran0 2020-09-17 13:21:28 +07:00
parent ad226893ee
commit 6477d94268
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/jni/input_bridge.c
View File

@ -19,14 +19,14 @@ void attachThreadIfNeed(bool* isAttached) {
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_sendData(JNIEnv* env, jclass clazz, jint type, jstring data) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_sendData(JNIEnv* env, jclass clazz, jint type, jstring data) {
if (env == dalvikJNIEnvPtr) { if (&env == &dalvikJNIEnvPtr) {
firstJavaVM = dalvikJavaVMPtr; firstJavaVM = dalvikJavaVMPtr;
firstJNIEnv = dalvikJNIEnvPtr; firstJNIEnv = dalvikJNIEnvPtr;
secondJavaVM = runtimeJavaVMPtr; secondJavaVM = runtimeJavaVMPtr;
secondJNIEnv = runtimeJNIEnvPtr; secondJNIEnv = runtimeJNIEnvPtr;
attachThreadIfNeed(&isAndroidThreadAttached); attachThreadIfNeed(&isAndroidThreadAttached);
} else if (env == runtimeJNIEnvPtr) { } else if (&env == &runtimeJNIEnvPtr) {
firstJavaVM = runtimeJavaVMPtr; firstJavaVM = runtimeJavaVMPtr;
firstJNIEnv = runtimeJNIEnvPtr; firstJNIEnv = runtimeJNIEnvPtr;
secondJavaVM = dalvikJavaVMPtr; secondJavaVM = dalvikJavaVMPtr;
@ -34,7 +34,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_sendData(JNIEnv* env,
attachThreadIfNeed(&isRuntimeThreadAttached); attachThreadIfNeed(&isRuntimeThreadAttached);
} else { } else {
printf("cancel input, env=%p\n", env); printf("cancel input, env=%p, artenv=%p, %jvmenv=%p\n", &env, &dalvikJNIEnvPtr, &runtimeJNIEnvPtr);
return; return;
} }

2
app/src/main/jni/jre_launcher.c
View File

@ -68,7 +68,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
LOGD("JNI_OnLoad calling initDalvikProxySelectorData()"); LOGD("JNI_OnLoad calling initDalvikProxySelectorData()");
initDalvikProxySelectorData(env); initDalvikProxySelectorData(env);
*/ */
} else if (dalvikJavaVMPtr != vm) { } else if (&dalvikJavaVMPtr != &vm) {
runtimeJavaVMPtr = vm; runtimeJavaVMPtr = vm;
// (*vm)->GetEnv(vm, (void**) &runtimeJNIEnvPtr, JNI_VERSION_1_4); // (*vm)->GetEnv(vm, (void**) &runtimeJNIEnvPtr, JNI_VERSION_1_4);
} }