encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: on rare occasion, prevent Android_JNI_GetNativeWindow() from crashing 

If Java getNativeSurface() returns null, then ANativeWindow_fromSurface() would crash().
This commit is contained in:
Sylvain Becker 2018-12-30 22:44:25 +01:00
parent 1e22fc1513
commit 03b0e1dee0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/android/SDL_android.c
View File

@ -951,13 +951,15 @@ static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder)
ANativeWindow* Android_JNI_GetNativeWindow(void) ANativeWindow* Android_JNI_GetNativeWindow(void)
{ {
ANativeWindow* anw; ANativeWindow *anw = NULL;
jobject s; jobject s;
JNIEnv *env = Android_JNI_GetEnv(); JNIEnv *env = Android_JNI_GetEnv();
s = (*env)->CallStaticObjectMethod(env, mActivityClass, midGetNativeSurface); s = (*env)->CallStaticObjectMethod(env, mActivityClass, midGetNativeSurface);
anw = ANativeWindow_fromSurface(env, s); if (s) {
(*env)->DeleteLocalRef(env, s); anw = ANativeWindow_fromSurface(env, s);
(*env)->DeleteLocalRef(env, s);
}
return anw; return anw;
} }