diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-20 00:05:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 00:05:00 +0100 |
| commit | 62e134a0c01bf19c2623dc73e05ebb6e0ab0c1b5 (patch) | |
| tree | 67c48534633931cee8e1b21c591e83b3abd62199 /platform/android/java_class_wrapper.cpp | |
| parent | ec3f220098f4bf5a10809e6682a9a24ff93d85cb (diff) | |
| parent | b3a43430aa1e6ac33025d86cde777e79be30ef99 (diff) | |
| download | redot-engine-62e134a0c01bf19c2623dc73e05ebb6e0ab0c1b5.tar.gz | |
Merge pull request #46818 from BastiaanOlij/fix_android_vulkan
Working on fixes for Android and Vulkan
Diffstat (limited to 'platform/android/java_class_wrapper.cpp')
| -rw-r--r-- | platform/android/java_class_wrapper.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index ab03599dc3..f49b0e843a 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -38,6 +38,7 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method, return false; JNIEnv *env = get_jni_env(); + ERR_FAIL_COND_V(env == nullptr, false); MethodInfo *method = nullptr; for (List<MethodInfo>::Element *E = M->get().front(); E; E = E->next()) { @@ -965,6 +966,7 @@ Ref<JavaClass> JavaClassWrapper::wrap(const String &p_class) { return class_cache[p_class]; JNIEnv *env = get_jni_env(); + ERR_FAIL_COND_V(env == nullptr, Ref<JavaClass>()); jclass bclass = env->FindClass(p_class.utf8().get_data()); ERR_FAIL_COND_V(!bclass, Ref<JavaClass>()); @@ -1149,6 +1151,7 @@ JavaClassWrapper::JavaClassWrapper(jobject p_activity) { singleton = this; JNIEnv *env = get_jni_env(); + ERR_FAIL_COND(env == nullptr); jclass activityClass = env->FindClass("android/app/Activity"); jmethodID getClassLoader = env->GetMethodID(activityClass, "getClassLoader", "()Ljava/lang/ClassLoader;"); |