From 44f4fdafbc5c27e469b0f8df048462a3170e4bd7 Mon Sep 17 00:00:00 2001
From: Remi Palandri <palandrir@gmail.com>
Date: Mon, 27 Jun 2022 19:24:58 -0700
Subject: [PATCH] fix preview window bug post-activity destruction

---
 renderdoccmd/renderdoccmd_android.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp
index dd6ac9189..bc0fbf986 100644
--- a/renderdoccmd/renderdoccmd_android.cpp
+++ b/renderdoccmd/renderdoccmd_android.cpp
@@ -126,10 +126,10 @@ void DisplayGenericSplash()
 
   EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 
-  ANativeWindow *previewWindow = android_state->window;
-
-  if(eglDisplay && previewWindow)
+  if(eglDisplay && android_state && android_state->window)
   {
+    ANativeWindow *previewWindow = android_state->window;
+
     int major = 0, minor = 0;
     EGLBoolean initialised = eglInitialize(eglDisplay, &major, &minor);
 
@@ -333,7 +333,7 @@ WindowingData DisplayRemoteServerPreview(bool active, const rdcarray<WindowingSy
 
   WindowingData ret = {WindowingSystem::Unknown};
 
-  if(android_state->window)
+  if(android_state && android_state->window)
     ret = CreateAndroidWindowingData(android_state->window);
 
   return ret;
@@ -491,4 +491,5 @@ void android_main(struct android_app *state)
   } while(android_state->destroyRequested == 0);
 
   ANDROID_LOG("android_main exiting");
+  android_state = NULL;
 }