From 6477d94268a09965456f03167402af70db0a22c3 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Thu, 17 Sep 2020 13:21:28 +0700 Subject: [PATCH] Fix check --- app/src/main/jni/input_bridge.c | 6 +++--- app/src/main/jni/jre_launcher.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/jni/input_bridge.c b/app/src/main/jni/input_bridge.c index 29ef3c7f2..e3fd49013 100644 --- a/app/src/main/jni/input_bridge.c +++ b/app/src/main/jni/input_bridge.c @@ -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) { - if (env == dalvikJNIEnvPtr) { + if (&env == &dalvikJNIEnvPtr) { firstJavaVM = dalvikJavaVMPtr; firstJNIEnv = dalvikJNIEnvPtr; secondJavaVM = runtimeJavaVMPtr; secondJNIEnv = runtimeJNIEnvPtr; attachThreadIfNeed(&isAndroidThreadAttached); - } else if (env == runtimeJNIEnvPtr) { + } else if (&env == &runtimeJNIEnvPtr) { firstJavaVM = runtimeJavaVMPtr; firstJNIEnv = runtimeJNIEnvPtr; secondJavaVM = dalvikJavaVMPtr; @@ -34,7 +34,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_sendData(JNIEnv* env, attachThreadIfNeed(&isRuntimeThreadAttached); } else { - printf("cancel input, env=%p\n", env); + printf("cancel input, env=%p, artenv=%p, %jvmenv=%p\n", &env, &dalvikJNIEnvPtr, &runtimeJNIEnvPtr); return; } diff --git a/app/src/main/jni/jre_launcher.c b/app/src/main/jni/jre_launcher.c index 987fd79da..a05451557 100644 --- a/app/src/main/jni/jre_launcher.c +++ b/app/src/main/jni/jre_launcher.c @@ -68,7 +68,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) LOGD("JNI_OnLoad calling initDalvikProxySelectorData()"); initDalvikProxySelectorData(env); */ - } else if (dalvikJavaVMPtr != vm) { + } else if (&dalvikJavaVMPtr != &vm) { runtimeJavaVMPtr = vm; // (*vm)->GetEnv(vm, (void**) &runtimeJNIEnvPtr, JNI_VERSION_1_4); }