From 9cb471e5bd6551a1144f208d22451a7b54fb54a1 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Oct 2018 16:13:34 -0700 Subject: [PATCH] Android: Avoid race on surface destroyed. Avoids a segfault in this scenario. --- android/jni/app-android.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 1eb3220d8d..1c509ad60d 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -939,7 +939,7 @@ extern "C" bool JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runEGLRenderLoop(J // This is up here to prevent race conditions, in case we pause during init. renderLoopRunning = true; - ANativeWindow *wnd = ANativeWindow_fromSurface(env, _surf); + ANativeWindow *wnd = _surf ? ANativeWindow_fromSurface(env, _surf) : nullptr; WLOG("runEGLRenderLoop. display_xres=%d display_yres=%d", display_xres, display_yres);